Skip to content

Commit 7553d0f

Browse files
committed
scsi: core: Handle devices which return an unusually large VPD page count
jira LE-2349 Rebuild_History Non-Buildable kernel-4.18.0-553.37.1.el8_10 commit-author Martin K. Petersen <martin.petersen@oracle.com> commit d09c05a Peter Schneider reported that a system would no longer boot after updating to 6.8.4. Peter bisected the issue and identified commit b5fc07a ("scsi: core: Consult supported VPD page list prior to fetching page") as being the culprit. Turns out the enclosure device in Peter's system reports a byteswapped page length for VPD page 0. It reports "02 00" as page length instead of "00 02". This causes us to attempt to access 516 bytes (page length + header) of information despite only 2 pages being present. Limit the page search scope to the size of our VPD buffer to guard against devices returning a larger page count than requested. Link: https://lore.kernel.org/r/20240521023040.2703884-1-martin.petersen@oracle.com Fixes: b5fc07a ("scsi: core: Consult supported VPD page list prior to fetching page") Cc: stable@vger.kernel.org Reported-by: Peter Schneider <pschneider1968@googlemail.com> Closes: https://lore.kernel.org/all/eec6ebbf-061b-4a7b-96dc-ea748aa4d035@googlemail.com/ Tested-by: Peter Schneider <pschneider1968@googlemail.com> Reviewed-by: Bart Van Assche <bvanassche@acm.org> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> (cherry picked from commit d09c05a) Signed-off-by: Jonathan Maple <jmaple@ciq.com>
1 parent f5bae85 commit 7553d0f

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

drivers/scsi/scsi.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -401,6 +401,13 @@ static int scsi_get_vpd_size(struct scsi_device *sdev, u8 page)
401401
if (result < SCSI_VPD_HEADER_SIZE)
402402
return 0;
403403

404+
if (result > sizeof(vpd)) {
405+
dev_warn_once(&sdev->sdev_gendev,
406+
"%s: long VPD page 0 length: %d bytes\n",
407+
__func__, result);
408+
result = sizeof(vpd);
409+
}
410+
404411
result -= SCSI_VPD_HEADER_SIZE;
405412
if (!memchr(&vpd[SCSI_VPD_HEADER_SIZE], page, result))
406413
return 0;

0 commit comments

Comments
 (0)