From 5b6250bc43fa6af4ed4997a46eaaba7414a2d292 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Fri, 7 Sep 2018 11:10:23 +0200 Subject: [PATCH] compat_ioctl: Remove /dev/random commands These are all handled by the random driver, so instead of listing each ioctl, we can use the generic compat_ptr_ioctl() helper. Change-Id: I3271ba0b0b3d6ae904cc87f983d7d3f99935e767 Acked-by: Greg Kroah-Hartman Signed-off-by: Arnd Bergmann Signed-off-by: Richard Raya --- drivers/char/random.c | 1 + fs/compat_ioctl.c | 7 ------- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/char/random.c b/drivers/char/random.c index 0f9a8c841660..f43d1c0d199c 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -1384,6 +1384,7 @@ const struct file_operations random_fops = { .write_iter = random_write_iter, .poll = random_poll, .unlocked_ioctl = random_ioctl, + .compat_ioctl = compat_ptr_ioctl, .fasync = random_fasync, .llseek = noop_llseek, .splice_read = generic_file_splice_read, diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index 281dc047b774..d40024adfe32 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c @@ -1208,13 +1208,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)