summaryrefslogtreecommitdiffstats
path: root/scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-10-08 12:10:10 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-10-08 12:10:33 -0400
commitda99f20f026faababa016afb0c23cc8af405f4ee (patch)
treea3accab6d05f4367a2a50875dab9f6999de2b82e /scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
parentce8e218a5e0856615ab3d25219fe73a576faa213 (diff)
downloadkernel-da99f20f026faababa016afb0c23cc8af405f4ee.tar.gz
kernel-da99f20f026faababa016afb0c23cc8af405f4ee.tar.xz
kernel-da99f20f026faababa016afb0c23cc8af405f4ee.zip
Linux v3.17-2860-gef0625b70dac
- Reenable debugging options. - Temporarily disable aarch64patches
Diffstat (limited to 'scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch')
-rw-r--r--scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch b/scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
index 9dad35ce2..54d65e24e 100644
--- a/scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
+++ b/scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
@@ -9,10 +9,10 @@ Upstream-status: Fedora mustard (might be worth dropping...)
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
-index 2c2041ca4b70..e10812d985af 100644
+index 0cb5c9f0c743..286b6e67d11d 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
-@@ -2749,13 +2749,18 @@ static int sd_try_extended_inquiry(struct scsi_device *sdp)
+@@ -2753,13 +2753,18 @@ static int sd_try_extended_inquiry(struct scsi_device *sdp)
static int sd_revalidate_disk(struct gendisk *disk)
{
struct scsi_disk *sdkp = scsi_disk(disk);