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

Commit 70fce7f1 authored by Jason A. Donenfeld's avatar Jason A. Donenfeld Committed by Greg Kroah-Hartman
Browse files

random: use proper return types on get_random_{int,long}_wait() 



commit 7c3a8a1db5e03d02cc0abb3357a84b8b326dfac3 upstream.

Before these were returning signed values, but the API is intended to be
used with unsigned values.

Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d05948dc

include/linux/random.h

+7 −7
Original line number Diff line number Diff line
@@ -81,18 +81,18 @@ static inline int get_random_bytes_wait(void *buf, size_t nbytes) 
	return ret;

}



#define declare_get_random_var_wait(var) \

	static inline int get_random_ ## var ## _wait(var *out) { \

#define declare_get_random_var_wait(name, ret_type) \

	static inline int get_random_ ## name ## _wait(ret_type *out) { \

		int ret = wait_for_random_bytes(); \

		if (unlikely(ret)) \

			return ret; \

		*out = get_random_ ## var(); \

		*out = get_random_ ## name(); \

		return 0; \

	}

declare_get_random_var_wait(u32)

declare_get_random_var_wait(u64)

declare_get_random_var_wait(int)

declare_get_random_var_wait(long)

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



/*