Commit de492c83 authored by Jason A. Donenfeld's avatar Jason A. Donenfeld
Browse files

prandom: remove unused functions 



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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Reviewed-by: default avatarYury Norov <yury.norov@gmail.com>
Acked-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
parent 197173db

drivers/char/random.c

+5 −6
Original line number Diff line number Diff line
@@ -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

 * to supply cryptographically secure random numbers. This applies to: the

 * /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.

 *          false if the input pool has not been seeded.
@@ -161,15 +161,14 @@ EXPORT_SYMBOL(wait_for_random_bytes); 
 *	u16 get_random_u16()

 *	u32 get_random_u32()

 *	u64 get_random_u64()

 *	unsigned int get_random_int()

 *	unsigned long get_random_long()

 *

 * These interfaces will return the requested number of random bytes

 * 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

 * family of functions may be higher performance for one-off random

 * integers, because they do a bit of buffering and do not invoke

 * reseeding until the buffer is emptied.

 * a read from /dev/urandom. The u8, u16, u32, u64, long family of

 * functions may be higher performance for one-off random integers,

 * because they do a bit of buffering and do not invoke reseeding

 * until the buffer is emptied.

 *

 *********************************************************************/

include/linux/prandom.h

+0 −12
Original line number Diff line number Diff line
@@ -12,18 +12,6 @@ 
#include <linux/percpu.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 {

	__u32 s1, s2, s3, s4;

};

include/linux/random.h

+0 −5
Original line number Diff line number Diff line
@@ -42,10 +42,6 @@ u8 get_random_u8(void); 
u16 get_random_u16(void);

u32 get_random_u32(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)

{

#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(u32, u32)

declare_get_random_var_wait(u64, u32)

declare_get_random_var_wait(int, unsigned int)

declare_get_random_var_wait(long, unsigned long)

#undef declare_get_random_var