diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2012-02-10 14:56:13 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2012-02-10 15:02:33 -0500 |
| commit | af1af57c4675931bc9f1657d84f0d8baf7bab328 (patch) | |
| tree | 401b2ec86a21f04bd0ec42e43b629deeeb5df76d /scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch | |
| parent | 268ca99517b53c764b6d209a67e2a038e3fe31b0 (diff) | |
| download | kernel-af1af57c4675931bc9f1657d84f0d8baf7bab328.tar.gz kernel-af1af57c4675931bc9f1657d84f0d8baf7bab328.tar.xz kernel-af1af57c4675931bc9f1657d84f0d8baf7bab328.zip | |
Patch to prevent NULL pointer dereference in sd_revalidate_disk (rhbz 754518)
Diffstat (limited to 'scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch')
| -rw-r--r-- | scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch b/scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch new file mode 100644 index 000000000..492376d78 --- /dev/null +++ b/scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch @@ -0,0 +1,22 @@ +--- a/drivers/scsi/sd.c ++++ a/drivers/scsi/sd.c +@@ -2362,13 +2362,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; + + SCSI_LOG_HLQUEUE(3, sd_printk(KERN_INFO, sdkp, + "sd_revalidate_disk\n")); + ++ if (!sdkp) ++ goto out; ++ ++ sdp = sdkp->device; ++ + /* + * If the device is offline, don't try and read capacity or any + * of the other niceties. |