diff options
| author | Laura Abbott <labbott@fedoraproject.org> | 2016-01-14 09:37:36 -0800 |
|---|---|---|
| committer | Laura Abbott <labbott@fedoraproject.org> | 2016-01-14 11:34:59 -0800 |
| commit | a2bb5001cb5e7472864102c74895c5e084cb0ac2 (patch) | |
| tree | 475e541607169f250a3f863ae5ed0e8c6192819a /scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch | |
| parent | cdfa7cd82ceb55c48ae6c0170d8a6d438e100715 (diff) | |
| download | kernel-a2bb5001cb5e7472864102c74895c5e084cb0ac2.tar.gz kernel-a2bb5001cb5e7472864102c74895c5e084cb0ac2.tar.xz kernel-a2bb5001cb5e7472864102c74895c5e084cb0ac2.zip | |
Linux v4.4
Diffstat (limited to 'scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch')
| -rw-r--r-- | scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch | 13 |
1 files changed, 9 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 a51cb9b4a..7b9976517 100644 --- a/scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch +++ b/scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch @@ -1,3 +1,4 @@ +From 7afe9a8d7dca86a8f35250f21f5f0a62ea2fedf7 Mon Sep 17 00:00:00 2001 From: "kernel-team@fedoraproject.org" <kernel-team@fedoraproject.org> Date: Fri, 10 Feb 2012 14:56:13 -0500 Subject: [PATCH] scsi: sd_revalidate_disk prevent NULL ptr deref @@ -9,18 +10,19 @@ 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 3b2fcb4fada0..f0f9e8574303 100644 +index 3d22fc3..07aec76 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c -@@ -2717,13 +2717,18 @@ static int sd_try_extended_inquiry(struct scsi_device *sdp) +@@ -2825,7 +2825,7 @@ static inline u32 logical_to_sectors(struct scsi_device *sdev, u32 blocks) 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; + struct request_queue *q = sdkp->disk->queue; unsigned char *buffer; - unsigned int max_xfer; - + unsigned int dev_max, rw_max; +@@ -2833,6 +2833,11 @@ static int sd_revalidate_disk(struct gendisk *disk) SCSI_LOG_HLQUEUE(3, sd_printk(KERN_INFO, sdkp, "sd_revalidate_disk\n")); @@ -32,3 +34,6 @@ index 3b2fcb4fada0..f0f9e8574303 100644 /* * If the device is offline, don't try and read capacity or any * of the other niceties. +-- +2.5.0 + |