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

treewide: use get_random_u32() when possible 



The prandom_u32() function has been a deprecated inline wrapper around
get_random_u32() for several releases now, and compiles down to the
exact same code. Replace the deprecated wrapper with a direct call to
the real function. The same also applies to get_random_int(), which is
just a wrapper around get_random_u32(). This was done as a basic find
and replace.

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>
Reviewed-by: Jan Kara <jack@suse.cz> # for ext4
Acked-by: Toke Høiland-Jørgensen <toke@toke.dk> # for sch_cake
Acked-by: Chuck Lever <chuck.lever@oracle.com> # for nfsd
Acked-by: default avatarJakub Kicinski <kuba@kernel.org>
Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com> # for thunderbolt
Acked-by: Darrick J. Wong <djwong@kernel.org> # for xfs
Acked-by: Helge Deller <deller@gmx.de> # for parisc
Acked-by: Heiko Carstens <hca@linux.ibm.com> # for s390
Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
parent f743f16c

Documentation/networking/filter.rst

+1 −1
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ Possible BPF extensions are shown in the following table: 
  vlan_tci                              skb_vlan_tag_get(skb)

  vlan_avail                            skb_vlan_tag_present(skb)

  vlan_tpid                             skb->vlan_proto

  rand                                  prandom_u32()

  rand                                  get_random_u32()

  ===================================   =================================================



These extensions can also be prefixed with '#'.

arch/parisc/kernel/process.c

+1 −1
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ __get_wchan(struct task_struct *p) 


static inline unsigned long brk_rnd(void)

{

	return (get_random_int() & BRK_RND_MASK) << PAGE_SHIFT;

	return (get_random_u32() & BRK_RND_MASK) << PAGE_SHIFT;

}



unsigned long arch_randomize_brk(struct mm_struct *mm)

arch/parisc/kernel/sys_parisc.c

+2 −2
Original line number Diff line number Diff line
@@ -239,14 +239,14 @@ static unsigned long mmap_rnd(void) 
	unsigned long rnd = 0;



	if (current->flags & PF_RANDOMIZE)

		rnd = get_random_int() & MMAP_RND_MASK;

		rnd = get_random_u32() & MMAP_RND_MASK;



	return rnd << PAGE_SHIFT;

}



unsigned long arch_mmap_rnd(void)

{

	return (get_random_int() & MMAP_RND_MASK) << PAGE_SHIFT;

	return (get_random_u32() & MMAP_RND_MASK) << PAGE_SHIFT;

}



static unsigned long mmap_legacy_base(void)

arch/s390/mm/mmap.c

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static inline int mmap_is_legacy(struct rlimit *rlim_stack) 


unsigned long arch_mmap_rnd(void)

{

	return (get_random_int() & MMAP_RND_MASK) << PAGE_SHIFT;

	return (get_random_u32() & MMAP_RND_MASK) << PAGE_SHIFT;

}



static unsigned long mmap_base_legacy(unsigned long rnd)

arch/x86/kernel/cpu/amd.c

+1 −1
Original line number Diff line number Diff line
@@ -503,7 +503,7 @@ static void bsp_init_amd(struct cpuinfo_x86 *c) 
		va_align.flags    = ALIGN_VA_32 | ALIGN_VA_64;



		/* A random value per boot for bit slice [12:upper_bit) */

		va_align.bits = get_random_int() & va_align.mask;

		va_align.bits = get_random_u32() & va_align.mask;

	}



	if (cpu_has(c, X86_FEATURE_MWAITX))