Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-12-29 09:16:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

prandom: remove prandom_u32_max()

Browse Source 
Convert the final two users of prandom_u32_max() that slipped in during
6.2-rc1 to use get_random_u32_below().

Then, with no more users left, we can finally remove the deprecated
function.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2022-10-09 20:45:07 -06:00
parent 41a15855c1
commit 3c202d14a9
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/mm/cpu_entry_area.c
View File

@ -36,7 +36,7 @@ static __init void init_cea_offsets(void)
unsigned int cea; unsigned int cea;
again: again:
cea = prandom_u32_max(max_cea); cea = get_random_u32_below(max_cea);
for_each_possible_cpu(j) { for_each_possible_cpu(j) {
if (cea_offset(j) == cea) if (cea_offset(j) == cea)

6
include/linux/prandom.h
View File

@ -24,12 +24,6 @@ void prandom_seed_full_state(struct rnd_state __percpu *pcpu_state);
#define prandom_init_once(pcpu_state) \ #define prandom_init_once(pcpu_state) \
DO_ONCE(prandom_seed_full_state, (pcpu_state)) DO_ONCE(prandom_seed_full_state, (pcpu_state))
/* Deprecated: use get_random_u32_below() instead. */
static inline u32 prandom_u32_max(u32 ep_ro)
{
return get_random_u32_below(ep_ro);
}
/* /*
* Handle minimum values for seeds * Handle minimum values for seeds
*/ */

2
net/ipv4/tcp_plb.c
View File

@ -97,7 +97,7 @@ void tcp_plb_update_state_upon_rto(struct sock *sk, struct tcp_plb_state *plb)
return; return;
pause = READ_ONCE(net->ipv4.sysctl_tcp_plb_suspend_rto_sec) * HZ; pause = READ_ONCE(net->ipv4.sysctl_tcp_plb_suspend_rto_sec) * HZ;
pause += prandom_u32_max(pause); pause += get_random_u32_below(pause);
plb->pause_until = tcp_jiffies32 + pause; plb->pause_until = tcp_jiffies32 + pause;
/* Reset PLB state upon RTO, since an RTO causes a sk_rethink_txhash() call /* Reset PLB state upon RTO, since an RTO causes a sk_rethink_txhash() call