niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

prandom: remove unused functions

Browse source 
With no callers left of prandom_u32() and prandom_bytes(), as well as
get_random_int(), remove these deprecated wrappers, in favor of
get_random_u32() and get_random_bytes().

Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Yury Norov <yury.norov@gmail.com>
Acked-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2022-10-05 17:50:20 +02:00
parent 197173db99
commit de492c83ca
3 changed files with 5 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/char/random.c
View file

@ -97,7 +97,7 @@ MODULE_PARM_DESC(ratelimit_disable, "Disable random ratelimit suppression");
* Returns whether or not the input pool has been seeded and thus guaranteed * Returns whether or not the input pool has been seeded and thus guaranteed
* to supply cryptographically secure random numbers. This applies to: the * to supply cryptographically secure random numbers. This applies to: the
* /dev/urandom device, the get_random_bytes function, and the get_random_{u8, * /dev/urandom device, the get_random_bytes function, and the get_random_{u8,
* u16,u32,u64,int,long} family of functions. * u16,u32,u64,long} family of functions.
* *
* Returns: true if the input pool has been seeded. * Returns: true if the input pool has been seeded.
* false if the input pool has not been seeded. * false if the input pool has not been seeded.
@ -161,15 +161,14 @@ EXPORT_SYMBOL(wait_for_random_bytes);
* u16 get_random_u16() * u16 get_random_u16()
* u32 get_random_u32() * u32 get_random_u32()
* u64 get_random_u64() * u64 get_random_u64()
* unsigned int get_random_int()
* unsigned long get_random_long() * unsigned long get_random_long()
* *
* These interfaces will return the requested number of random bytes * These interfaces will return the requested number of random bytes
* into the given buffer or as a return value. This is equivalent to * into the given buffer or as a return value. This is equivalent to
* a read from /dev/urandom. The u8, u16, u32, u64, int, and long * a read from /dev/urandom. The u8, u16, u32, u64, long family of
* family of functions may be higher performance for one-off random * functions may be higher performance for one-off random integers,
* integers, because they do a bit of buffering and do not invoke * because they do a bit of buffering and do not invoke reseeding
* reseeding until the buffer is emptied. * until the buffer is emptied.
* *
*********************************************************************/ *********************************************************************/

12
include/linux/prandom.h
View file

@ -12,18 +12,6 @@
#include <linux/percpu.h> #include <linux/percpu.h>
#include <linux/random.h> #include <linux/random.h>
/* Deprecated: use get_random_u32 instead. */
static inline u32 prandom_u32(void)
{
return get_random_u32();
}
/* Deprecated: use get_random_bytes instead. */
static inline void prandom_bytes(void *buf, size_t nbytes)
{
return get_random_bytes(buf, nbytes);
}
struct rnd_state { struct rnd_state {
__u32 s1, s2, s3, s4; __u32 s1, s2, s3, s4;
}; };

5
include/linux/random.h
View file

@ -42,10 +42,6 @@ u8 get_random_u8(void);
u16 get_random_u16(void); u16 get_random_u16(void);
u32 get_random_u32(void); u32 get_random_u32(void);
u64 get_random_u64(void); u64 get_random_u64(void);
static inline unsigned int get_random_int(void)
{
return get_random_u32();
}
static inline unsigned long get_random_long(void) static inline unsigned long get_random_long(void)
{ {
#if BITS_PER_LONG == 64 #if BITS_PER_LONG == 64
@ -100,7 +96,6 @@ declare_get_random_var_wait(u8, u8)
declare_get_random_var_wait(u16, u16) declare_get_random_var_wait(u16, u16)
declare_get_random_var_wait(u32, u32) declare_get_random_var_wait(u32, u32)
declare_get_random_var_wait(u64, u32) declare_get_random_var_wait(u64, u32)
declare_get_random_var_wait(int, unsigned int)
declare_get_random_var_wait(long, unsigned long) declare_get_random_var_wait(long, unsigned long)
#undef declare_get_random_var #undef declare_get_random_var