summaryrefslogtreecommitdiffstats
path: root/scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-05-25 10:32:01 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-05-25 10:32:01 -0400
commit264ac3865c49ef26c9dfdc07a006b5c435ded72c (patch)
tree657886b71dbb6255e37ad0758e698df81853cda2 /scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
parent58bbe0b0646c0e2ede47af739b864531c4b2366e (diff)
downloadkernel-264ac3865c49ef26c9dfdc07a006b5c435ded72c.tar.gz
kernel-264ac3865c49ef26c9dfdc07a006b5c435ded72c.tar.xz
kernel-264ac3865c49ef26c9dfdc07a006b5c435ded72c.zip
Linux v4.1-rc5
- Disable debugging options.
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 b8543ca2e..30b1540ae 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 79beebf53302..eca0b7e0944f 100644
+index 7f9d65fe4fd9..371e2cb79c11 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
-@@ -2726,13 +2726,18 @@ static int sd_try_extended_inquiry(struct scsi_device *sdp)
+@@ -2717,13 +2717,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);