diff options
| author | Jeremy Cline <jcline@redhat.com> | 2020-02-13 13:19:24 -0500 |
|---|---|---|
| committer | Jeremy Cline <jcline@redhat.com> | 2020-02-13 13:23:54 -0500 |
| commit | 888c6eedbce38ed6a9d9ef2ff51b2460503dc004 (patch) | |
| tree | 2f58a512293c4feeac485cad76a87f4a739e0c55 | |
| parent | fab133265b39b443e3bdb7d9fe0955f7271594ad (diff) | |
| download | kernel-888c6eedbce38ed6a9d9ef2ff51b2460503dc004.tar.gz kernel-888c6eedbce38ed6a9d9ef2ff51b2460503dc004.tar.xz kernel-888c6eedbce38ed6a9d9ef2ff51b2460503dc004.zip | |
Pull in fix so a number of ioctls aren't compat (rhbz 1801353)
Signed-off-by: Jeremy Cline <jcline@redhat.com>
| -rw-r--r-- | 0001-Replace-.ioctl-with-.compat_ioctl-in-three-appropria.patch | 59 | ||||
| -rw-r--r-- | kernel.spec | 5 |
2 files changed, 64 insertions, 0 deletions
diff --git a/0001-Replace-.ioctl-with-.compat_ioctl-in-three-appropria.patch b/0001-Replace-.ioctl-with-.compat_ioctl-in-three-appropria.patch new file mode 100644 index 000000000..fd34594ab --- /dev/null +++ b/0001-Replace-.ioctl-with-.compat_ioctl-in-three-appropria.patch @@ -0,0 +1,59 @@ +From 31218a134206dc0d1d74551852b5f7fc42c3c966 Mon Sep 17 00:00:00 2001 +From: Adam Williamson <awilliam@redhat.com> +Date: Wed, 12 Feb 2020 08:10:19 -0800 +Subject: [PATCH] Replace .ioctl with .compat_ioctl in three appropriate places + +Arnd Bergmann inadvertently typoed these in d320a9551e394 and +64cbfa96551a; they seem to be the cause of +https://bugzilla.redhat.com/show_bug.cgi?id=1801353 , invalid +SCSI commands when udev tries to query a DVD drive. + +Signed-off-by: Adam Williamson <awilliam@redhat.com> +--- + drivers/block/paride/pcd.c | 2 +- + drivers/cdrom/gdrom.c | 2 +- + drivers/scsi/sr.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/drivers/block/paride/pcd.c b/drivers/block/paride/pcd.c +index 117cfc8cd05a..cda5cf917e9a 100644 +--- a/drivers/block/paride/pcd.c ++++ b/drivers/block/paride/pcd.c +@@ -276,7 +276,7 @@ static const struct block_device_operations pcd_bdops = { + .release = pcd_block_release, + .ioctl = pcd_block_ioctl, + #ifdef CONFIG_COMPAT +- .ioctl = blkdev_compat_ptr_ioctl, ++ .compat_ioctl = blkdev_compat_ptr_ioctl, + #endif + .check_events = pcd_block_check_events, + }; +diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c +index 886b2638c730..0f3f9558716a 100644 +--- a/drivers/cdrom/gdrom.c ++++ b/drivers/cdrom/gdrom.c +@@ -519,7 +519,7 @@ static const struct block_device_operations gdrom_bdops = { + .check_events = gdrom_bdops_check_events, + .ioctl = gdrom_bdops_ioctl, + #ifdef CONFIG_COMPAT +- .ioctl = blkdev_compat_ptr_ioctl, ++ .compat_ioctl = blkdev_compat_ptr_ioctl, + #endif + }; + +diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c +index 0fbb8fe6e521..e4240e4ae8bb 100644 +--- a/drivers/scsi/sr.c ++++ b/drivers/scsi/sr.c +@@ -688,7 +688,7 @@ static const struct block_device_operations sr_bdops = + .release = sr_block_release, + .ioctl = sr_block_ioctl, + #ifdef CONFIG_COMPAT +- .ioctl = sr_block_compat_ioctl, ++ .compat_ioctl = sr_block_compat_ioctl, + #endif + .check_events = sr_block_check_events, + .revalidate_disk = sr_block_revalidate_disk, +-- +2.25.0 + diff --git a/kernel.spec b/kernel.spec index c3765b693..cd41ccc5a 100644 --- a/kernel.spec +++ b/kernel.spec @@ -861,6 +861,8 @@ Patch528: 0001-x86-Don-t-declare-__force_order-in-kaslr_64.c.patch Patch529: 0001-Include-kvm_asm.h-and-kvm_arm.h-in-kvm-arm-trace.h.patch +Patch530: 0001-Replace-.ioctl-with-.compat_ioctl-in-three-appropria.patch + # END OF PATCH DEFINITIONS %endif @@ -2890,6 +2892,9 @@ fi # # %changelog +* Thu Feb 13 2020 Jeremy Cline <jcline@redhat.com> +- Pull in cdrom ioctl fix (rhbz 1801353) + * Tue Feb 11 2020 Jeremy Cline <jcline@redhat.com> - 5.6.0-0.rc1.git1.1 - Linux v5.6-rc1-5-g0a679e13ea30 |