diff options
| author | Laura Abbott <labbott@redhat.com> | 2019-08-15 15:21:04 -0400 |
|---|---|---|
| committer | Laura Abbott <labbott@redhat.com> | 2019-09-16 10:48:43 -0400 |
| commit | 8cd931114e65baf5eb02920c83b4ac650c9e18b2 (patch) | |
| tree | 44ede8c780ec128f9413c104ca07960e78846f9b | |
| parent | 9742e529b878106143a0a68c4734af4328688a99 (diff) | |
| download | kernel-8cd931114e65baf5eb02920c83b4ac650c9e18b2.tar.gz kernel-8cd931114e65baf5eb02920c83b4ac650c9e18b2.tar.xz kernel-8cd931114e65baf5eb02920c83b4ac650c9e18b2.zip | |
Drop scsi warning patch
It's been years since we've seen this warning. Just drop it.
Signed-off-by: Laura Abbott <labbott@redhat.com>
| -rw-r--r-- | kernel.spec | 2 | ||||
| -rw-r--r-- | scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch | 39 |
2 files changed, 0 insertions, 41 deletions
diff --git a/kernel.spec b/kernel.spec index 9c7732aa1..fc2eeee0f 100644 --- a/kernel.spec +++ b/kernel.spec @@ -507,8 +507,6 @@ Patch116: crash-driver.patch Patch117: lis3-improve-handling-of-null-rate.patch -Patch118: scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch - Patch120: ath9k-rx-dma-stop-check.patch Patch122: Input-synaptics-pin-3-touches-when-the-firmware-repo.patch diff --git a/scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch b/scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch deleted file mode 100644 index a19267cc1..000000000 --- a/scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch +++ /dev/null @@ -1,39 +0,0 @@ -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 - -Bugzilla: 754518 -Upstream-status: Fedora mustard (might be worth dropping...) ---- - drivers/scsi/sd.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c -index 3d22fc3..07aec76 100644 ---- a/drivers/scsi/sd.c -+++ b/drivers/scsi/sd.c -@@ -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; - sector_t old_capacity = sdkp->capacity; - unsigned char *buffer; -@@ -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")); - -+ if (WARN_ONCE((!sdkp), "Invalid scsi_disk from %p\n", disk)) -+ goto out; -+ -+ sdp = sdkp->device; -+ - /* - * If the device is offline, don't try and read capacity or any - * of the other niceties. --- -2.5.0 - |