From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-Id: <20130911042920.022634292@goodmis.org> Date: Wed, 11 Sep 2013 00:29:53 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Martin K. Petersen" , Alan Stern , Stuart Foster , James Bottomley Subject: [166/251] Dont attempt to send extended INQUIRY command if skip_vpd_pages is set References: <20130911042707.738353451@goodmis.org> Content-Disposition: inline; filename=0166-Don-t-attempt-to-send-extended-INQUIRY-command-if-sk.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: 3.6.11.9-rc1 stable review patch. If anyone has any objections, please let me know. ------------------ From: "Martin K. Petersen" [ Upstream commit 7562523e84ddc742fe1f9db8bd76b01acca89f6b ] If a device has the skip_vpd_pages flag set we should simply fail the scsi_get_vpd_page() call. Signed-off-by: Martin K. Petersen Acked-by: Alan Stern Tested-by: Stuart Foster Cc: stable@vger.kernel.org Signed-off-by: James Bottomley Signed-off-by: Steven Rostedt --- drivers/scsi/scsi.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c index 2936b44..5dba497 100644 --- a/drivers/scsi/scsi.c +++ b/drivers/scsi/scsi.c @@ -1030,6 +1030,9 @@ int scsi_get_vpd_page(struct scsi_device *sdev, u8 page, unsigned char *buf, { int i, result; + if (sdev->skip_vpd_pages) + goto fail; + /* Ask for all the pages supported by this device */ result = scsi_vpd_inquiry(sdev, buf, 0, buf_len); if (result) -- 1.7.10.4