summaryrefslogtreecommitdiff
path: root/include/uapi
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-04-22 07:20:48 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2018-04-22 07:20:48 +0300
commit285848b0f4074f04ab606f1e5dca296482033d54 (patch)
treed807840875deed64561550304e8e1907b7d0b215 /include/uapi
parent4c50ceae8f3b56e7c13b327f01e973b4127142a2 (diff)
parentd848e5f8e1ebdb227d045db55fe4f825e82965fa (diff)
downloadlinux-285848b0f4074f04ab606f1e5dca296482033d54.tar.xz
Merge tag 'random_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random
Pull /dev/random fixes from Ted Ts'o: "Fix some bugs in the /dev/random driver which causes getrandom(2) to unblock earlier than designed. Thanks to Jann Horn from Google's Project Zero for pointing this out to me" * tag 'random_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random: random: add new ioctl RNDRESEEDCRNG random: crng_reseed() should lock the crng instance that it is modifying random: set up the NUMA crng instances after the CRNG is fully initialized random: use a different mixing algorithm for add_device_randomness() random: fix crng_ready() test
Diffstat (limited to 'include/uapi')
-rw-r--r--include/uapi/linux/random.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/uapi/linux/random.h b/include/uapi/linux/random.h
index c34f4490d025..26ee91300e3e 100644
--- a/include/uapi/linux/random.h
+++ b/include/uapi/linux/random.h
@@ -35,6 +35,9 @@
/* Clear the entropy pool and associated counters. (Superuser only.) */
#define RNDCLEARPOOL _IO( 'R', 0x06 )
+/* Reseed CRNG. (Superuser only.) */
+#define RNDRESEEDCRNG _IO( 'R', 0x07 )
+
struct rand_pool_info {
int entropy_count;
int buf_size;