| From 16d3ea26f82271fef9b1c4523b5e1ea31fa39eec Mon Sep 17 00:00:00 2001 |
| From: Martin K. Petersen <martin.petersen@oracle.com> |
| Date: Fri, 10 Sep 2010 01:20:27 -0400 |
| Subject: [SCSI] Fix VPD inquiry page wrapper |
| |
| From: Martin K. Petersen <martin.petersen@oracle.com> |
| |
| commit 16d3ea26f82271fef9b1c4523b5e1ea31fa39eec upstream. |
| |
| 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> |
| Signed-off-by: James Bottomley <James.Bottomley@suse.de> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/scsi/scsi.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/scsi/scsi.c |
| +++ b/drivers/scsi/scsi.c |
| @@ -1046,13 +1046,13 @@ int scsi_get_vpd_page(struct scsi_device |
| |
| /* 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 */ |
