diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2014-08-08 05:42:06 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2014-08-08 08:47:17 -0400 |
| commit | 3f7b3ae795ae20036db10c6b0da66b6b4545bd33 (patch) | |
| tree | e8eebc9436b8d6cb520ad6f0d2f5b26a66308131 /scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch | |
| parent | d2b85a675da297656fe1fc09f93da2ae7f73e6e1 (diff) | |
| download | kernel-3f7b3ae795ae20036db10c6b0da66b6b4545bd33.tar.gz kernel-3f7b3ae795ae20036db10c6b0da66b6b4545bd33.tar.xz kernel-3f7b3ae795ae20036db10c6b0da66b6b4545bd33.zip | |
Linux v3.16-7503-g33caee39925b
Diffstat (limited to 'scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch')
| -rw-r--r-- | scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch b/scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch index 2cdbc31f5..350705249 100644 --- a/scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch +++ b/scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch @@ -1,16 +1,19 @@ Bugzilla: 754518 Upstream-status: Fedora mustard (might be worth dropping...) ---- a/drivers/scsi/sd.c -+++ a/drivers/scsi/sd.c -@@ -2362,13 +2362,18 @@ static int sd_try_extended_inquiry(struct scsi_device *sdp) + +diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c +index 2c2041ca4b70..e10812d985af 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) static int sd_revalidate_disk(struct gendisk *disk) { struct scsi_disk *sdkp = scsi_disk(disk); - struct scsi_device *sdp = sdkp->device; + struct scsi_device *sdp; unsigned char *buffer; - unsigned flush = 0; + unsigned int max_xfer; SCSI_LOG_HLQUEUE(3, sd_printk(KERN_INFO, sdkp, "sd_revalidate_disk\n")); |