rpms
/
kernel
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Patch to prevent NULL pointer dereference in sd_revalidate_disk (rhbz 754518)

This commit is contained in:
Josh Boyer 2012-02-10 14:56:13 -05:00
parent aef732d8e5
commit 0b719f3d4a
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
kernel.spec
View File

@ -42,7 +42,7 @@ Summary: The Linux kernel
# When changing real_sublevel below, reset this by hand to 1
# (or to 0 and then use rpmdev-bumpspec).
#
%global baserelease 2
%global baserelease 3
%global fedora_build %{baserelease}
# real_sublevel is the 3.x kernel version we're starting with
@ -701,6 +701,9 @@ Patch21091: bcma-brcmsmac-compat.patch
#rhbz 785806
Patch21092: e1000e-Avoid-wrong-check-on-TX-hang.patch
#rhbz 754518
Patch21093: scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
#rhbz 771058
Patch21100: msi-irq-sysfs-warning.patch
@ -1305,6 +1308,9 @@ ApplyPatch jbd2-clear-BH_Delay-and-BH_Unwritten-in-journal_unmap_buf.patch
#rhbz 785806
ApplyPatch e1000e-Avoid-wrong-check-on-TX-hang.patch
#rhbz 754518
ApplyPatch scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
# Remove overlap between bcma/b43 and brcmsmac and reenable bcm4331
ApplyPatch bcma-brcmsmac-compat.patch
@ -1955,6 +1961,9 @@ fi
# and build.
%changelog
* Fri Feb 10 2012 Josh Boyer <jwboyer@redhat.com>
- Patch to prevent NULL pointer dereference in sd_revalidate_disk (rhbz 754518)
* Fri Feb 10 2012 Dave Jones <davej@redhat.com>
- Implement TIOCGSERIAL for acm_tty_ioctl (rhbz 787607)

22
scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch Normal file
View File

@ -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.