Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHannes Reinecke <hare@suse.de>2016-06-13 15:00:54 +0200
committerHannes Reinecke <hare@suse.de>2016-06-13 15:00:57 +0200
commit097a8f9ddfbcab59c780697de18bba039c64938a (patch)
tree475e382339bd013459a8bf052c0903184e197965
parentbc0cbeb14f31f4d39ac0610ec2a49177acada8f3 (diff)
scsi: disable VPD page check on error (bsc#981954).
-rw-r--r--patches.fixes/scsi-disable-VPD-page-check-on-error.patch45
-rw-r--r--series.conf1
2 files changed, 46 insertions, 0 deletions
diff --git a/patches.fixes/scsi-disable-VPD-page-check-on-error.patch b/patches.fixes/scsi-disable-VPD-page-check-on-error.patch
new file mode 100644
index 0000000000..943b54bddf
--- /dev/null
+++ b/patches.fixes/scsi-disable-VPD-page-check-on-error.patch
@@ -0,0 +1,45 @@
+From: Hannes Reinecke <hare@suse.de>
+Date: Mon, 13 Jun 2016 12:07:05 +0200
+Subject: scsi: disable VPD page check on error
+References: bsc#981954
+Patch-Mainline: submitted linux-scsi, 2016/06/13
+
+If we encounter an error during VPD page scanning we should be
+setting the 'skip_vpd_pages' bit to avoid further accesses.
+
+Signed-off-by: Hannes Reinecke <hare@suse.com>
+---
+ drivers/scsi/scsi.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
+index 4543d3c..00f922e 100644
+--- a/drivers/scsi/scsi.c
++++ b/drivers/scsi/scsi.c
+@@ -796,6 +796,7 @@ retry_pg0:
+ result = scsi_vpd_inquiry(sdev, vpd_buf, 0, vpd_len);
+ if (result < 0) {
+ kfree(vpd_buf);
++ sdev->skip_vpd_pages = true;
+ return;
+ }
+ if (result > vpd_len) {
+@@ -823,6 +824,7 @@ retry_pg80:
+ result = scsi_vpd_inquiry(sdev, vpd->buf, 0x80, vpd_len);
+ if (result < 0) {
+ kfree(vpd);
++ sdev->skip_vpd_pages = true;
+ return;
+ }
+ if (result > vpd_len) {
+@@ -852,6 +854,7 @@ retry_pg83:
+ result = scsi_vpd_inquiry(sdev, vpd->buf, 0x83, vpd_len);
+ if (result < 0) {
+ kfree(vpd);
++ sdev->skip_vpd_pages = true;
+ return;
+ }
+ if (result > vpd_len) {
+--
+1.8.5.6
+
diff --git a/series.conf b/series.conf
index 6aa4d56b36..4190191af5 100644
--- a/series.conf
+++ b/series.conf
@@ -1727,6 +1727,7 @@
patches.fixes/scsi_lib-Decode-T10-vendor-IDs.patch
patches.fixes/scsi-Centralise-ssp-frame-information-units.patch
patches.fixes/scsi-Add-Marvell-configuration-device-to-VPD-blacklist.patch
+ patches.fixes/scsi-disable-VPD-page-check-on-error.patch
patches.suse/fcoe-reduce-max_sectors
patches.fixes/libfc-Update-rport-reference-counting.patch