Blame SOURCES/0207-udev-scsi_id-fix-incorrect-page-length-when-get-devi.patch
|
 |
4fbe94 |
From 7b3ef169e3142fb471c48f265881b371380d77e0 Mon Sep 17 00:00:00 2001
|
|
|
4fbe94 |
From: Zhang Xianwei <zhang.xianwei8@zte.com.cn>
|
|
|
4fbe94 |
Date: Mon, 13 May 2019 18:41:55 +0800
|
|
|
4fbe94 |
Subject: [PATCH] udev/scsi_id: fix incorrect page length when get device
|
|
|
4fbe94 |
identification VPD page
|
|
|
4fbe94 |
|
|
|
4fbe94 |
The length of device identification VPD page is filled with two bytes,
|
|
|
4fbe94 |
but scsi_id only gets the low byte. Fix it.
|
|
|
4fbe94 |
|
|
|
4fbe94 |
Signed-off-by: Zhang Xianwei <zhang.xianwei8@zte.com.cn>
|
|
|
4fbe94 |
(cherry picked from commit 1f7b6872dbe8ccae1f3bda9aa6aeb87c9b42e01e)
|
|
|
4fbe94 |
|
|
|
4fbe94 |
Resolves: #1713227
|
|
|
4fbe94 |
---
|
|
|
4fbe94 |
src/udev/scsi_id/scsi_serial.c | 2 +-
|
|
|
4fbe94 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
4fbe94 |
|
|
|
4fbe94 |
diff --git a/src/udev/scsi_id/scsi_serial.c b/src/udev/scsi_id/scsi_serial.c
|
|
|
4fbe94 |
index fd91657a32..fb6055395d 100644
|
|
|
4fbe94 |
--- a/src/udev/scsi_id/scsi_serial.c
|
|
|
4fbe94 |
+++ b/src/udev/scsi_id/scsi_serial.c
|
|
|
4fbe94 |
@@ -661,7 +661,7 @@ static int do_scsi_page83_inquiry(struct udev *udev,
|
|
|
4fbe94 |
* Examine each descriptor returned. There is normally only
|
|
|
4fbe94 |
* one or a small number of descriptors.
|
|
|
4fbe94 |
*/
|
|
|
4fbe94 |
- for (j = 4; j <= (unsigned int)page_83[3] + 3; j += page_83[j + 3] + 4) {
|
|
|
4fbe94 |
+ for (j = 4; j <= ((unsigned)page_83[2] << 8) + (unsigned)page_83[3] + 3; j += page_83[j + 3] + 4) {
|
|
|
4fbe94 |
retval = check_fill_0x83_id(udev,
|
|
|
4fbe94 |
dev_scsi, &page_83[j],
|
|
|
4fbe94 |
&id_search_list[id_ind],
|