Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c925604 authored by Andreas Schwab's avatar Andreas Schwab Committed by Al Viro
Browse files

[PATCH] Fix block dev compat ioctl handling 



Commit 33c2dca4 (trim file propagation
in block/compat_ioctl.c) removed the handling of some ioctls from
compat_blkdev_driver_ioctl.  That caused them to be rejected as unknown
by the compat layer.

Signed-off-by: default avatarAndreas Schwab <schwab@suse.de>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 50c396d3

block/compat_ioctl.c

+23 −0
Original line number Diff line number Diff line
@@ -677,6 +677,29 @@ static int compat_blkdev_driver_ioctl(struct block_device *bdev, fmode_t mode, 
	case DVD_WRITE_STRUCT:

	case DVD_AUTH:

		arg = (unsigned long)compat_ptr(arg);

	/* These intepret arg as an unsigned long, not as a pointer,

	 * so we must not do compat_ptr() conversion. */

	case HDIO_SET_MULTCOUNT:

	case HDIO_SET_UNMASKINTR:

	case HDIO_SET_KEEPSETTINGS:

	case HDIO_SET_32BIT:

	case HDIO_SET_NOWERR:

	case HDIO_SET_DMA:

	case HDIO_SET_PIO_MODE:

	case HDIO_SET_NICE:

	case HDIO_SET_WCACHE:

	case HDIO_SET_ACOUSTIC:

	case HDIO_SET_BUSSTATE:

	case HDIO_SET_ADDRESS:

	case CDROMEJECT_SW:

	case CDROM_SET_OPTIONS:

	case CDROM_CLEAR_OPTIONS:

	case CDROM_SELECT_SPEED:

	case CDROM_SELECT_DISC:

	case CDROM_MEDIA_CHANGED:

	case CDROM_DRIVE_STATUS:

	case CDROM_LOCKDOOR:

	case CDROM_DEBUG:

		break;

	default:

		/* unknown ioctl number */