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

Commit 927fc225 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

compat_ioctl: remove /dev/random commands 



commit 507e4e2b430b6a27b66f4745564ecaee7967737f upstream.

These are all handled by the random driver, so instead of listing
each ioctl, we can use the generic compat_ptr_ioctl() helper.

Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 996fba14

drivers/char/random.c

+1 −0
Original line number Diff line number Diff line
@@ -2190,6 +2190,7 @@ const struct file_operations random_fops = { 
	.write = random_write,

	.poll  = random_poll,

	.unlocked_ioctl = random_ioctl,

	.compat_ioctl = compat_ptr_ioctl,

	.fasync = random_fasync,

	.llseek = noop_llseek,

};

fs/compat_ioctl.c

+0 −7
Original line number Diff line number Diff line
@@ -808,13 +808,6 @@ COMPATIBLE_IOCTL(WDIOC_SETTIMEOUT) 
COMPATIBLE_IOCTL(WDIOC_GETTIMEOUT)

COMPATIBLE_IOCTL(WDIOC_SETPRETIMEOUT)

COMPATIBLE_IOCTL(WDIOC_GETPRETIMEOUT)

/* Big R */

COMPATIBLE_IOCTL(RNDGETENTCNT)

COMPATIBLE_IOCTL(RNDADDTOENTCNT)

COMPATIBLE_IOCTL(RNDGETPOOL)

COMPATIBLE_IOCTL(RNDADDENTROPY)

COMPATIBLE_IOCTL(RNDZAPENTCNT)

COMPATIBLE_IOCTL(RNDCLEARPOOL)

/* Bluetooth */

COMPATIBLE_IOCTL(HCIDEVUP)

COMPATIBLE_IOCTL(HCIDEVDOWN)