Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c566c065 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

ANDROID: change function signatures for some random functions. 



In 5.4.200 the functions add_device_randomness() and get_random_bytes()
want from:
	void get_random_bytes(void *buf, int len);
		->
	void get_random_bytes(void *buf, size_t len);

	void add_device_randomness(const void *buf, unsigned int len);
		->
	void add_device_randomness(const void *buf, size_t len);

As these functions are part of the GKI abi to be preserved, move them
back.  As these are just lengths of the buffer, all is fine with the
size, they should never overflow.

Bug: 161946584
Fixes: b5306841 ("random: make more consistent use of integer types")
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I5430259958b9a904e6e8b950e11526332c919c0c
parent b2351c23

drivers/char/random.c

+2 −2
Original line number Diff line number Diff line
@@ -432,7 +432,7 @@ static void _get_random_bytes(void *buf, size_t len) 
 * wait_for_random_bytes() should be called and return 0 at least once

 * at any point prior.

 */

void get_random_bytes(void *buf, size_t len)

void get_random_bytes(void *buf, int len)

{

	warn_unseeded_randomness();

	_get_random_bytes(buf, len);
@@ -847,7 +847,7 @@ int __init random_init(const char *command_line) 
 * the entropy pool having similar initial state across largely

 * identical devices.

 */

void add_device_randomness(const void *buf, size_t len)

void add_device_randomness(const void *buf, unsigned int len)

{

	unsigned long entropy = random_get_entropy();

	unsigned long flags;

include/linux/random.h

+2 −2
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 


struct notifier_block;



void add_device_randomness(const void *buf, size_t len);

void add_device_randomness(const void *buf, unsigned int len);

void __init add_bootloader_randomness(const void *buf, size_t len);

void add_input_randomness(unsigned int type, unsigned int code,

			  unsigned int value) __latent_entropy;
@@ -28,7 +28,7 @@ static inline void add_latent_entropy(void) 
static inline void add_latent_entropy(void) { }

#endif



void get_random_bytes(void *buf, size_t len);

void get_random_bytes(void *buf, int len);

size_t __must_check get_random_bytes_arch(void *buf, size_t len);

u32 get_random_u32(void);

u64 get_random_u64(void);