This is a note to let you know that I've just added the patch titled
compat_ioctl: remove /dev/random commands
to the 5.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
compat_ioctl-remove-dev-random-commands.patch
and it can be found in the queue-5.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From foo@baz Fri Jun 17 09:02:32 AM CEST 2022
From: Arnd Bergmann <arnd@xxxxxxxx>
Date: Fri, 7 Sep 2018 11:10:23 +0200
Subject: compat_ioctl: remove /dev/random commands
From: Arnd Bergmann <arnd@xxxxxxxx>
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: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
Signed-off-by: Jason A. Donenfeld <Jason@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/char/random.c | 1 +
fs/compat_ioctl.c | 7 -------
2 files changed, 1 insertion(+), 7 deletions(-)
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -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,
};
--- a/fs/compat_ioctl.c
+++ b/fs/compat_ioctl.c
@@ -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)
Patches currently in stable-queue which might be from arnd@xxxxxxxx are
queue-5.4/um-use-fallback-for-random_get_entropy-instead-of-zero.patch
queue-5.4/sparc-use-fallback-for-random_get_entropy-instead-of-zero.patch
queue-5.4/xtensa-use-fallback-for-random_get_entropy-instead-of-zero.patch
queue-5.4/ia64-define-get_cycles-macro-for-arch-override.patch
queue-5.4/timekeeping-add-raw-clock-fallback-for-random_get_entropy.patch
queue-5.4/arm-use-fallback-for-random_get_entropy-instead-of-zero.patch
queue-5.4/compat_ioctl-remove-dev-random-commands.patch
queue-5.4/nios2-use-fallback-for-random_get_entropy-instead-of-zero.patch
queue-5.4/parisc-define-get_cycles-macro-for-arch-override.patch
queue-5.4/x86-tsc-use-fallback-for-random_get_entropy-instead-of-zero.patch
queue-5.4/random-don-t-forget-compat_ioctl-on-urandom.patch
queue-5.4/m68k-use-fallback-for-random_get_entropy-instead-of-zero.patch
queue-5.4/alpha-define-get_cycles-macro-for-arch-override.patch
queue-5.4/s390-define-get_cycles-macro-for-arch-override.patch
queue-5.4/powerpc-define-get_cycles-macro-for-arch-override.patch
queue-5.4/mips-use-fallback-for-random_get_entropy-instead-of-just-c0-random.patch
