Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

scsi: compat_ioctl: cdrom: Replace .ioctl with .compat_ioctl in four 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.

[arnd] Found another instance of the same bug, also introduced in my
compat_ioctl series.

Link: https://bugzilla.redhat.com/show_bug.cgi?id=1801353
Link: https://lore.kernel.org/r/20200219165139.3467320-1-arnd@arndb.de
Fixes: c103d6ee69f9 ("compat_ioctl: ide: floppy: add handler")
Fixes: 64cbfa96551a ("compat_ioctl: move cdrom commands into cdrom.c")
Fixes: d320a9551e39 ("compat_ioctl: scsi: move ioctl handling into drivers")
Bisected-by: Chris Murphy <bugzilla@colorremedies.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Adam Williamson <awilliam@redhat.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

authored by

Adam Williamson and committed by
Martin K. Petersen
03264ddd a3fd4bfe

+4 -4
+1 -1
drivers/block/paride/pcd.c
··· 276 .release = pcd_block_release, 277 .ioctl = pcd_block_ioctl, 278 #ifdef CONFIG_COMPAT 279 - .ioctl = blkdev_compat_ptr_ioctl, 280 #endif 281 .check_events = pcd_block_check_events, 282 };
··· 276 .release = pcd_block_release, 277 .ioctl = pcd_block_ioctl, 278 #ifdef CONFIG_COMPAT 279 + .compat_ioctl = blkdev_compat_ptr_ioctl, 280 #endif 281 .check_events = pcd_block_check_events, 282 };
+1 -1
drivers/cdrom/gdrom.c
··· 519 .check_events = gdrom_bdops_check_events, 520 .ioctl = gdrom_bdops_ioctl, 521 #ifdef CONFIG_COMPAT 522 - .ioctl = blkdev_compat_ptr_ioctl, 523 #endif 524 }; 525
··· 519 .check_events = gdrom_bdops_check_events, 520 .ioctl = gdrom_bdops_ioctl, 521 #ifdef CONFIG_COMPAT 522 + .compat_ioctl = blkdev_compat_ptr_ioctl, 523 #endif 524 }; 525
+1 -1
drivers/ide/ide-gd.c
··· 361 .release = ide_gd_release, 362 .ioctl = ide_gd_ioctl, 363 #ifdef CONFIG_COMPAT 364 - .ioctl = ide_gd_compat_ioctl, 365 #endif 366 .getgeo = ide_gd_getgeo, 367 .check_events = ide_gd_check_events,
··· 361 .release = ide_gd_release, 362 .ioctl = ide_gd_ioctl, 363 #ifdef CONFIG_COMPAT 364 + .compat_ioctl = ide_gd_compat_ioctl, 365 #endif 366 .getgeo = ide_gd_getgeo, 367 .check_events = ide_gd_check_events,
+1 -1
drivers/scsi/sr.c
··· 688 .release = sr_block_release, 689 .ioctl = sr_block_ioctl, 690 #ifdef CONFIG_COMPAT 691 - .ioctl = sr_block_compat_ioctl, 692 #endif 693 .check_events = sr_block_check_events, 694 .revalidate_disk = sr_block_revalidate_disk,
··· 688 .release = sr_block_release, 689 .ioctl = sr_block_ioctl, 690 #ifdef CONFIG_COMPAT 691 + .compat_ioctl = sr_block_compat_ioctl, 692 #endif 693 .check_events = sr_block_check_events, 694 .revalidate_disk = sr_block_revalidate_disk,