summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin K. Petersen <martin.petersen@oracle.com>2010-09-10 01:20:27 -0400
committerJames Bottomley <James.Bottomley@suse.de>2010-09-16 11:48:48 -0400
commit16d3ea26f82271fef9b1c4523b5e1ea31fa39eec (patch)
treeeeb4e01e9d46adc8f83208d1162cc8f4ab327128
parent9c03f1622af051004416dd3e24d8a0fa31e34178 (diff)
downloadlinux-stable-16d3ea26f82271fef9b1c4523b5e1ea31fa39eec.tar.gz
linux-stable-16d3ea26f82271fef9b1c4523b5e1ea31fa39eec.tar.bz2
linux-stable-16d3ea26f82271fef9b1c4523b5e1ea31fa39eec.zip
[SCSI] Fix VPD inquiry page wrapper
Fix two bugs in the VPD page wrapper: - Don't return failure if the user asked for page 0 - The end of buffer check failed to account for the page header size and consequently didn't work Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> Cc: Stable Tree <stable@kernel.org> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
-rw-r--r--drivers/scsi/scsi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index ad0ed212db4a..348fba0a8976 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -1046,13 +1046,13 @@ int scsi_get_vpd_page(struct scsi_device *sdev, u8 page, unsigned char *buf,
/* If the user actually wanted this page, we can skip the rest */
if (page == 0)
- return -EINVAL;
+ return 0;
for (i = 0; i < min((int)buf[3], buf_len - 4); i++)
if (buf[i + 4] == page)
goto found;
- if (i < buf[3] && i > buf_len)
+ if (i < buf[3] && i >= buf_len - 4)
/* ran off the end of the buffer, give us benefit of doubt */
goto found;
/* The device claims it doesn't support the requested page */