treewide cleanup of random integer usage
Subsystems (116)
Jason A. Donenfeld
maintainerv6 cover treewide cleanup of random integer usage
Changes v5->v6:
- Added a few missing conversions that weren't in my older tree, so now this should be ready to go, as well as a couple nits people had from v5. Barring something large and unforeseen, this is the "final version", as this is ready to ship. Thanks to everyone who reviewed this.
Hi folks,
This is a five part treewide cleanup of random integer handling. The rules for random integers are:
- If you want a secure or an insecure random u64, use get_random_u64().
- If you want a secure or an insecure random u32, use get_random_u32().
* The old function prandom_u32() has been deprecated for a while now and is just a wrapper around get_random_u32(). Same for get_random_int().
- If you want a secure or an insecure random u16, use get_random_u16().
- If you want a secure or an insecure random u8, use get_random_u8().
- If you want secure or insecure random bytes, use get_random_bytes().
* The old function prandom_bytes() has been deprecated for a while now and has long been a wrapper around get_random_bytes().
- If you want a non-uniform random u32, u16, or u8 bounded by a certain open interval maximum, use prandom_u32_max().
* I say "non-uniform", because it doesn't do any rejection sampling or divisions. Hence, it stays within the prandom_* namespace.
These rules ought to be applied uniformly, so that we can clean up the deprecated functions, and earn the benefits of using the modern functions. In particular, in addition to the boring substitutions, this patchset accomplishes a few nice effects:
- By using prandom_u32_max() with an upper-bound that the compiler can prove at compile-time is ≤65536 or ≤256, internally get_random_u16() or get_random_u8() is used, which wastes fewer batched random bytes, and hence has higher throughput.
- By using prandom_u32_max() instead of %, when the upper-bound is not a constant, division is still avoided, because prandom_u32_max() uses a faster multiplication-based trick instead.
- By using get_random_u16() or get_random_u8() in cases where the return value is intended to indeed be a u16 or a u8, we waste fewer batched random bytes, and hence have higher throughput.
So, based on those rules and benefits from following them, this patchset breaks down into the following five steps:
1) Replace prandom_u32() % max and variants thereof with prandom_u32_max(max).
* Part 1 is done with Coccinelle. Part 2 is done by hand.
2) Replace (type)get_random_u32() and variants thereof with get_random_u16() or get_random_u8(). I took the pains to actually look and see what every lvalue type was across the entire tree.
* Part 1 is done with Coccinelle. Part 2 is done by hand.
3) Replace remaining deprecated uses of prandom_u32() and get_random_int() with get_random_u32().
* A boring search and replace operation.
4) Replace remaining deprecated uses of prandom_bytes() with get_random_bytes().
* A boring search and replace operation.
5) Remove the deprecated and now-unused prandom_u32() and prandom_bytes() inline wrapper functions.
* Just deleting code and updating comments.
I'll be sending this toward the end of the 6.1 merge window via the random.git tree.
Please take a look! The number of lines touched is quite small, so this should be reviewable, and as much as is possible has been pushed into Coccinelle scripts.
Thanks,
Jason
Jason A. Donenfeld (7):
treewide: use prandom_u32_max() when possible, part 1
treewide: use prandom_u32_max() when possible, part 2
treewide: use get_random_{u8,u16}() when possible, part 1
treewide: use get_random_{u8,u16}() when possible, part 2
treewide: use get_random_u32() when possible
treewide: use get_random_bytes() when possible
prandom: remove unused functions
Documentation/networking/filter.rst | 2 +- arch/arm/kernel/process.c | 2 +- arch/arm/kernel/signal.c | 2 +- arch/arm64/kernel/process.c | 2 +- arch/arm64/kernel/syscall.c | 2 +- arch/loongarch/kernel/process.c | 2 +- arch/loongarch/kernel/vdso.c | 2 +- arch/mips/kernel/process.c | 2 +- arch/mips/kernel/vdso.c | 2 +- arch/parisc/kernel/process.c | 2 +- arch/parisc/kernel/sys_parisc.c | 4 +- arch/parisc/kernel/vdso.c | 2 +- arch/powerpc/crypto/crc-vpmsum_test.c | 2 +- arch/powerpc/kernel/process.c | 2 +- arch/s390/kernel/process.c | 4 +- arch/s390/kernel/vdso.c | 2 +- arch/s390/mm/mmap.c | 2 +- arch/sparc/vdso/vma.c | 2 +- arch/um/kernel/process.c | 2 +- arch/x86/entry/vdso/vma.c | 2 +- arch/x86/kernel/cpu/amd.c | 2 +- arch/x86/kernel/module.c | 2 +- arch/x86/kernel/process.c | 2 +- arch/x86/mm/pat/cpa-test.c | 4 +- block/blk-crypto-fallback.c | 2 +- crypto/async_tx/raid6test.c | 2 +- crypto/testmgr.c | 94 +++++++++---------- drivers/block/drbd/drbd_receiver.c | 4 +- drivers/char/random.c | 11 +-- drivers/dma/dmatest.c | 2 +- .../gpu/drm/i915/gem/i915_gem_execbuffer.c | 2 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 6 +- .../gpu/drm/i915/selftests/i915_selftest.c | 2 +- drivers/gpu/drm/tests/drm_buddy_test.c | 2 +- drivers/gpu/drm/tests/drm_mm_test.c | 2 +- drivers/infiniband/core/cma.c | 2 +- drivers/infiniband/hw/cxgb4/cm.c | 4 +- drivers/infiniband/hw/cxgb4/id_table.c | 4 +- drivers/infiniband/hw/hfi1/tid_rdma.c | 2 +- drivers/infiniband/hw/hns/hns_roce_ah.c | 5 +- drivers/infiniband/hw/mlx4/mad.c | 2 +- drivers/infiniband/ulp/ipoib/ipoib_cm.c | 2 +- drivers/infiniband/ulp/rtrs/rtrs-clt.c | 3 +- drivers/md/bcache/request.c | 2 +- drivers/md/raid5-cache.c | 2 +- drivers/media/common/v4l2-tpg/v4l2-tpg-core.c | 2 +- .../media/test-drivers/vivid/vivid-radio-rx.c | 4 +- .../test-drivers/vivid/vivid-touch-cap.c | 6 +- drivers/misc/habanalabs/gaudi2/gaudi2.c | 2 +- drivers/mmc/core/core.c | 4 +- drivers/mmc/host/dw_mmc.c | 2 +- drivers/mtd/nand/raw/nandsim.c | 8 +- drivers/mtd/tests/mtd_nandecctest.c | 12 +-- drivers/mtd/tests/speedtest.c | 2 +- drivers/mtd/tests/stresstest.c | 19 +--- drivers/mtd/ubi/debug.c | 2 +- drivers/mtd/ubi/debug.h | 6 +- drivers/net/bonding/bond_main.c | 2 +- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 +- drivers/net/ethernet/broadcom/cnic.c | 5 +- .../chelsio/inline_crypto/chtls/chtls_cm.c | 4 +- .../chelsio/inline_crypto/chtls/chtls_io.c | 4 +- drivers/net/ethernet/rocker/rocker_main.c | 8 +- drivers/net/hamradio/baycom_epp.c | 2 +- drivers/net/hamradio/hdlcdrv.c | 2 +- drivers/net/hamradio/yam.c | 2 +- drivers/net/phy/at803x.c | 2 +- drivers/net/wireguard/selftest/allowedips.c | 16 ++-- .../broadcom/brcm80211/brcmfmac/p2p.c | 2 +- .../broadcom/brcm80211/brcmfmac/pno.c | 2 +- .../net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 2 +- .../net/wireless/marvell/mwifiex/cfg80211.c | 4 +- .../wireless/microchip/wilc1000/cfg80211.c | 2 +- .../net/wireless/quantenna/qtnfmac/cfg80211.c | 2 +- drivers/net/wireless/st/cw1200/wsm.c | 2 +- drivers/net/wireless/ti/wlcore/main.c | 2 +- drivers/nvme/common/auth.c | 2 +- drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 4 +- drivers/scsi/fcoe/fcoe_ctlr.c | 4 +- drivers/scsi/lpfc/lpfc_hbadisc.c | 6 +- drivers/scsi/qedi/qedi_main.c | 2 +- drivers/target/iscsi/cxgbit/cxgbit_cm.c | 2 +- drivers/thunderbolt/xdomain.c | 2 +- drivers/video/fbdev/uvesafb.c | 2 +- fs/ceph/inode.c | 2 +- fs/ceph/mdsmap.c | 2 +- fs/exfat/inode.c | 2 +- fs/ext2/ialloc.c | 3 +- fs/ext4/ialloc.c | 7 +- fs/ext4/ioctl.c | 4 +- fs/ext4/mmp.c | 2 +- fs/ext4/super.c | 7 +- fs/f2fs/gc.c | 2 +- fs/f2fs/namei.c | 2 +- fs/f2fs/segment.c | 8 +- fs/fat/inode.c | 2 +- fs/nfsd/nfs4state.c | 4 +- fs/ntfs3/fslog.c | 6 +- fs/ubifs/debug.c | 10 +- fs/ubifs/journal.c | 2 +- fs/ubifs/lpt_commit.c | 14 +-- fs/ubifs/tnc_commit.c | 2 +- fs/xfs/libxfs/xfs_alloc.c | 2 +- fs/xfs/libxfs/xfs_ialloc.c | 4 +- fs/xfs/xfs_error.c | 2 +- fs/xfs/xfs_icache.c | 2 +- fs/xfs/xfs_log.c | 2 +- include/linux/nodemask.h | 2 +- include/linux/prandom.h | 12 --- include/linux/random.h | 5 - include/net/netfilter/nf_queue.h | 2 +- include/net/red.h | 2 +- include/net/sock.h | 2 +- kernel/bpf/bloom_filter.c | 2 +- kernel/bpf/core.c | 6 +- kernel/bpf/hashtab.c | 2 +- kernel/bpf/verifier.c | 2 +- kernel/kcsan/selftest.c | 4 +- kernel/locking/test-ww_mutex.c | 4 +- kernel/time/clocksource.c | 2 +- lib/cmdline_kunit.c | 4 +- lib/fault-inject.c | 2 +- lib/find_bit_benchmark.c | 4 +- lib/kobject.c | 2 +- lib/random32.c | 4 +- lib/reed_solomon/test_rslib.c | 12 +-- lib/sbitmap.c | 4 +- lib/test-string_helpers.c | 2 +- lib/test_fprobe.c | 2 +- lib/test_hexdump.c | 10 +- lib/test_kasan.c | 6 +- lib/test_kprobes.c | 2 +- lib/test_list_sort.c | 2 +- lib/test_min_heap.c | 6 +- lib/test_objagg.c | 2 +- lib/test_rhashtable.c | 6 +- lib/test_vmalloc.c | 19 +--- lib/uuid.c | 2 +- mm/migrate.c | 2 +- mm/shmem.c | 2 +- mm/slab.c | 2 +- mm/slub.c | 2 +- net/802/garp.c | 2 +- net/802/mrp.c | 2 +- net/ceph/mon_client.c | 2 +- net/ceph/osd_client.c | 2 +- net/core/neighbour.c | 2 +- net/core/pktgen.c | 47 +++++----- net/core/stream.c | 2 +- net/dccp/ipv4.c | 4 +- net/ipv4/datagram.c | 2 +- net/ipv4/igmp.c | 6 +- net/ipv4/inet_connection_sock.c | 2 +- net/ipv4/inet_hashtables.c | 2 +- net/ipv4/ip_output.c | 2 +- net/ipv4/route.c | 4 +- net/ipv4/tcp_cdg.c | 2 +- net/ipv4/tcp_ipv4.c | 4 +- net/ipv4/udp.c | 2 +- net/ipv6/addrconf.c | 8 +- net/ipv6/ip6_flowlabel.c | 2 +- net/ipv6/mcast.c | 10 +- net/ipv6/output_core.c | 2 +- net/mac80211/rc80211_minstrel_ht.c | 2 +- net/mac80211/scan.c | 2 +- net/netfilter/ipvs/ip_vs_conn.c | 2 +- net/netfilter/ipvs/ip_vs_twos.c | 4 +- net/netfilter/nf_nat_core.c | 4 +- net/netfilter/xt_statistic.c | 2 +- net/openvswitch/actions.c | 2 +- net/packet/af_packet.c | 2 +- net/rds/bind.c | 2 +- net/sched/act_gact.c | 2 +- net/sched/act_sample.c | 2 +- net/sched/sch_cake.c | 8 +- net/sched/sch_netem.c | 22 ++--- net/sched/sch_pie.c | 2 +- net/sched/sch_sfb.c | 2 +- net/sctp/socket.c | 4 +- net/sunrpc/auth_gss/gss_krb5_wrap.c | 4 +- net/sunrpc/cache.c | 2 +- net/sunrpc/xprt.c | 2 +- net/sunrpc/xprtsock.c | 2 +- net/tipc/socket.c | 2 +- net/unix/af_unix.c | 2 +- net/xfrm/xfrm_state.c | 2 +- 186 files changed, 379 insertions(+), 422 deletions(-)
Signature · 7 lines
2.37.3 _______________________________________________ linux-um mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-um
Jason A. Donenfeld
maintainerPATCH v6 1/7 treewide: use prandom_u32_max() when possible, part 1
Rather than incurring a division or requesting too many random bytes for the given range, use the prandom_u32_max() function, which only takes the minimum required bytes from the RNG and avoids divisions. This was done mechanically with this coccinelle script:
@basic@
expression E;
type T;
identifier get_random_u32 =~ "get_random_int|prandom_u32|get_random_u32"; typedef u64;
@@
(
- ((T)get_random_u32() % (E))
+ prandom_u32_max(E)
|
- ((T)get_random_u32() & ((E) - 1))
+ prandom_u32_max(E * XXX_MAKE_SURE_E_IS_POW2)
|
- ((u64)(E) * get_random_u32() >> 32)
+ prandom_u32_max(E)
|
- ((T)get_random_u32() & ~PAGE_MASK)
+ prandom_u32_max(PAGE_SIZE)
)
@multi_line@
identifier get_random_u32 =~ "get_random_int|prandom_u32|get_random_u32"; identifier RAND;
expression E;
@@
- RAND = get_random_u32();
... when != RAND- RAND %= (E);
+ RAND = prandom_u32_max(E);
// Find a potential literal
@literal_mask@
expression LITERAL;
type T;
identifier get_random_u32 =~ "get_random_int|prandom_u32|get_random_u32"; position p;
@@
((T)get_random_u32()@p & (LITERAL))
// Add one to the literal.
@script:python add_one@
literal << literal_mask.LITERAL;
RESULT;
@@
value = None
if literal.startswith('0x'):
value = int(literal, 16)
elif literal[0] in '123456789':
value = int(literal, 10)
if value is None:
print("I don't know how to handle %s" % (literal))
cocci.include_match(False)
elif value == 2**32 - 1 or value == 2**31 - 1 or value == 2**24 - 1 or value == 2**16 - 1 or value == 2**8 - 1:
print("Skipping 0x%x for cleanup elsewhere" % (value))
cocci.include_match(False)
elif value & (value + 1) != 0:
print("Skipping 0x%x because it's not a power of two minus one" % (value))
cocci.include_match(False)
elif literal.startswith('0x'):
coccinelle.RESULT = cocci.make_expr("0x%x" % (value + 1))
else:
coccinelle.RESULT = cocci.make_expr("%d" % (value + 1))// Replace the literal mask with the calculated result. @plus_one@
expression literal_mask.LITERAL;
position literal_mask.p;
expression add_one.RESULT;
identifier FUNC;
@@
- (FUNC()@p & (LITERAL))
+ prandom_u32_max(RESULT)
@collapse_ret@
type T;
identifier VAR;
expression E;
@@
{
- T VAR; - VAR = (E); - return VAR; + return E;
}
@drop_var@
type T;
identifier VAR;
@@
{
- T VAR;
... when != VAR}
--- arch/arm/kernel/process.c | 2 +- arch/arm64/kernel/process.c | 2 +- arch/loongarch/kernel/process.c | 2 +- arch/loongarch/kernel/vdso.c | 2 +- arch/mips/kernel/process.c | 2 +- arch/mips/kernel/vdso.c | 2 +- arch/parisc/kernel/vdso.c | 2 +- arch/powerpc/kernel/process.c | 2 +- arch/s390/kernel/process.c | 2 +- arch/s390/kernel/vdso.c | 2 +- arch/sparc/vdso/vma.c | 2 +- arch/um/kernel/process.c | 2 +- arch/x86/entry/vdso/vma.c | 2 +- arch/x86/kernel/module.c | 2 +- arch/x86/kernel/process.c | 2 +- arch/x86/mm/pat/cpa-test.c | 4 +- crypto/testmgr.c | 86 +++++++++---------- drivers/block/drbd/drbd_receiver.c | 4 +- .../gpu/drm/i915/gem/i915_gem_execbuffer.c | 2 +- drivers/infiniband/core/cma.c | 2 +- drivers/infiniband/hw/cxgb4/id_table.c | 4 +- drivers/infiniband/hw/hns/hns_roce_ah.c | 5 +- drivers/infiniband/ulp/rtrs/rtrs-clt.c | 3 +- drivers/md/bcache/request.c | 2 +- .../test-drivers/vivid/vivid-touch-cap.c | 2 +- drivers/mmc/core/core.c | 4 +- drivers/mmc/host/dw_mmc.c | 2 +- drivers/mtd/nand/raw/nandsim.c | 4 +- drivers/mtd/tests/mtd_nandecctest.c | 10 +-- drivers/mtd/tests/stresstest.c | 17 +--- drivers/mtd/ubi/debug.c | 2 +- drivers/mtd/ubi/debug.h | 6 +- drivers/net/ethernet/broadcom/cnic.c | 3 +- .../chelsio/inline_crypto/chtls/chtls_io.c | 4 +- drivers/net/hamradio/baycom_epp.c | 2 +- drivers/net/hamradio/hdlcdrv.c | 2 +- drivers/net/hamradio/yam.c | 2 +- drivers/net/phy/at803x.c | 2 +- .../broadcom/brcm80211/brcmfmac/p2p.c | 2 +- .../net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 2 +- drivers/scsi/fcoe/fcoe_ctlr.c | 4 +- drivers/scsi/qedi/qedi_main.c | 2 +- fs/ceph/inode.c | 2 +- fs/ceph/mdsmap.c | 2 +- fs/ext4/super.c | 7 +- fs/f2fs/gc.c | 2 +- fs/f2fs/segment.c | 8 +- fs/ubifs/debug.c | 8 +- fs/ubifs/lpt_commit.c | 14 +-- fs/ubifs/tnc_commit.c | 2 +- fs/xfs/libxfs/xfs_alloc.c | 2 +- fs/xfs/libxfs/xfs_ialloc.c | 2 +- fs/xfs/xfs_error.c | 2 +- include/linux/nodemask.h | 2 +- kernel/bpf/core.c | 4 +- kernel/locking/test-ww_mutex.c | 4 +- kernel/time/clocksource.c | 2 +- lib/fault-inject.c | 2 +- lib/find_bit_benchmark.c | 4 +- lib/kobject.c | 2 +- lib/reed_solomon/test_rslib.c | 6 +- lib/sbitmap.c | 2 +- lib/test-string_helpers.c | 2 +- lib/test_hexdump.c | 10 +-- lib/test_kasan.c | 6 +- lib/test_list_sort.c | 2 +- mm/migrate.c | 2 +- mm/slub.c | 2 +- net/802/garp.c | 2 +- net/802/mrp.c | 2 +- net/ceph/mon_client.c | 2 +- net/ceph/osd_client.c | 2 +- net/core/neighbour.c | 2 +- net/core/pktgen.c | 43 +++++----- net/core/stream.c | 2 +- net/ipv4/igmp.c | 6 +- net/ipv4/inet_connection_sock.c | 2 +- net/ipv4/inet_hashtables.c | 2 +- net/ipv6/addrconf.c | 8 +- net/ipv6/mcast.c | 10 +-- net/netfilter/ipvs/ip_vs_twos.c | 4 +- net/packet/af_packet.c | 2 +- net/sched/act_gact.c | 2 +- net/sched/act_sample.c | 2 +- net/sched/sch_netem.c | 4 +- net/sctp/socket.c | 2 +- net/sunrpc/cache.c | 2 +- net/sunrpc/xprtsock.c | 2 +- net/tipc/socket.c | 2 +- net/xfrm/xfrm_state.c | 2 +- 90 files changed, 205 insertions(+), 219 deletions(-)
arch/arm/kernel/process.c +1 -1
@@ -375,7 +375,7 @@ static unsigned long sigpage_addr(const struct mm_struct *mm, slots = ((last - first) >>PAGE_SHIFT ) +1 ; - offset =get_random_int () % slots; + offset =prandom_u32_max (slots); addr = first + (offset <<PAGE_SHIFT );
arch/arm64/kernel/process.c +1 -1
@@ -595,7 +595,7 @@ unsigned long __get_wchan(struct task_struct *p)unsigned long arch_align_stack (unsigned long sp) {if (!(current->personality &ADDR_NO_RANDOMIZE ) && randomize_va_space) - sp -=get_random_int () & ~PAGE_MASK ; + sp -=prandom_u32_max (PAGE_SIZE );return sp & ~0xf ; }
arch/loongarch/kernel/process.c +1 -1
@@ -293,7 +293,7 @@ unsigned long stack_top(void)unsigned long arch_align_stack (unsigned long sp) {if (!(current->personality &ADDR_NO_RANDOMIZE ) && randomize_va_space) - sp -=get_random_int () & ~PAGE_MASK ; + sp -=prandom_u32_max (PAGE_SIZE );return sp &STACK_ALIGN ; }
arch/loongarch/kernel/vdso.c +1 -1
@@ -78,7 +78,7 @@ static unsigned long vdso_base(void)unsigned long base =STACK_TOP ;if (current->flags &PF_RANDOMIZE ) { - base +=get_random_int () & (VDSO_RANDOMIZE_SIZE -1 ); + base +=prandom_u32_max (VDSO_RANDOMIZE_SIZE ); base =PAGE_ALIGN (base); }
arch/mips/kernel/process.c +1 -1
@@ -711,7 +711,7 @@ unsigned long mips_stack_top(void)unsigned long arch_align_stack (unsigned long sp) {if (!(current->personality &ADDR_NO_RANDOMIZE ) && randomize_va_space) - sp -=get_random_int () & ~PAGE_MASK ; + sp -=prandom_u32_max (PAGE_SIZE );return sp &ALMASK ; }
arch/mips/kernel/vdso.c +1 -1
@@ -79,7 +79,7 @@ static unsigned long vdso_base(void) }if (current->flags &PF_RANDOMIZE ) { - base +=get_random_int () & (VDSO_RANDOMIZE_SIZE -1 ); + base +=prandom_u32_max (VDSO_RANDOMIZE_SIZE ); base =PAGE_ALIGN (base); }
arch/parisc/kernel/vdso.c +1 -1
@@ -75,7 +75,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, map_base = mm->mmap_base;if (current->flags &PF_RANDOMIZE ) - map_base -= (get_random_int () &0x1f ) *PAGE_SIZE ; + map_base -=prandom_u32_max (0x20 ) *PAGE_SIZE ; vdso_text_start =get_unmapped_area (NULL , map_base, vdso_text_len,0 ,0 );
arch/powerpc/kernel/process.c +1 -1
@@ -2308,6 +2308,6 @@ void notrace __ppc64_runlatch_off(void)unsigned long arch_align_stack (unsigned long sp) {if (!(current->personality &ADDR_NO_RANDOMIZE ) && randomize_va_space) - sp -=get_random_int () & ~PAGE_MASK ; + sp -=prandom_u32_max (PAGE_SIZE );return sp & ~0xf ; }
arch/s390/kernel/process.c +1 -1
@@ -224,7 +224,7 @@ unsigned long __get_wchan(struct task_struct *p)unsigned long arch_align_stack (unsigned long sp) {if (!(current->personality &ADDR_NO_RANDOMIZE ) && randomize_va_space) - sp -=get_random_int () & ~PAGE_MASK ; + sp -=prandom_u32_max (PAGE_SIZE );return sp & ~0xf ; }
arch/s390/kernel/vdso.c +1 -1
@@ -226,7 +226,7 @@ static unsigned long vdso_addr(unsigned long start, unsigned long len) end -= len;if (end > start) { - offset =get_random_int () % (((end - start) >>PAGE_SHIFT ) +1 ); + offset =prandom_u32_max (((end - start) >>PAGE_SHIFT ) +1 ); addr = start + (offset <<PAGE_SHIFT ); }else { addr = start;
arch/sparc/vdso/vma.c +1 -1
@@ -354,7 +354,7 @@ static unsigned long vdso_addr(unsigned long start, unsigned int len)unsigned int offset;/* This loses some more bits than a modulo, but is cheaper */ - offset =get_random_int () & (PTRS_PER_PTE -1 ); + offset =prandom_u32_max (PTRS_PER_PTE );return start + (offset <<PAGE_SHIFT ); }
arch/um/kernel/process.c +1 -1
@@ -356,7 +356,7 @@ int singlestepping(void * t)unsigned long arch_align_stack (unsigned long sp) {if (!(current->personality &ADDR_NO_RANDOMIZE ) && randomize_va_space) - sp -=get_random_int () %8192 ; + sp -=prandom_u32_max (8192 );return sp & ~0xf ; }#endif
arch/x86/entry/vdso/vma.c +1 -1
@@ -327,7 +327,7 @@ static unsigned long vdso_addr(unsigned long start, unsigned len) end -= len;if (end > start) { - offset =get_random_int () % (((end - start) >>PAGE_SHIFT ) +1 ); + offset =prandom_u32_max (((end - start) >>PAGE_SHIFT ) +1 ); addr = start + (offset <<PAGE_SHIFT ); }else { addr = start;
arch/x86/kernel/module.c +1 -1
@@ -53,7 +53,7 @@ static unsigned long int get_module_load_offset(void)*/ if (module_load_offset ==0 ) module_load_offset = - (get_random_int () %1024 +1 ) *PAGE_SIZE ; + (prandom_u32_max (1024 ) +1 ) *PAGE_SIZE ;mutex_unlock (&module_kaslr_mutex); }return module_load_offset;
arch/x86/kernel/process.c +1 -1
@@ -965,7 +965,7 @@ early_param("idle", idle_setup);unsigned long arch_align_stack (unsigned long sp) {if (!(current->personality &ADDR_NO_RANDOMIZE ) && randomize_va_space) - sp -=get_random_int () %8192 ; + sp -=prandom_u32_max (8192 );return sp & ~0xf ; }
arch/x86/mm/pat/cpa-test.c +2 -2
@@ -136,10 +136,10 @@ static int pageattr_test(void) failed +=print_split (&sa);for (i =0 ; i <NTEST ; i++) { -unsigned long pfn =prandom_u32 () % max_pfn_mapped; +unsigned long pfn =prandom_u32_max (max_pfn_mapped); addr[i] = (unsigned long )__va (pfn <<PAGE_SHIFT ); - len[i] =prandom_u32 () %NPAGES ; + len[i] =prandom_u32_max (NPAGES ); len[i] = min_t(unsigned long, len[i], max_pfn_mapped - pfn - 1);if (len[i] ==0 )
crypto/testmgr.c +43 -43
235 lines not on this page · raw message
drivers/block/drbd/drbd_receiver.c +2 -2
@@ -781,7 +781,7 @@ static struct socket *drbd_wait_for_connect(struct drbd_connection *connection, timeo = connect_int *HZ ;/* 28.5% random jitter */ - timeo += (prandom_u32 () &1 ) ? timeo /7 : -timeo /7 ; + timeo +=prandom_u32_max (2 ) ? timeo /7 : -timeo /7 ; err =wait_for_completion_interruptible_timeout (&ad->door_bell, timeo);if (err <=0 )
@@ -1004,7 +1004,7 @@ static int conn_connect(struct drbd_connection *connection)drbd_warn (connection,"Error receiving initial packet\n" );sock_release (s); randomize: -if (prandom_u32 () &1 ) +if (prandom_u32_max (2 )) goto retry; } }
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +1 -1
@@ -2424,7 +2424,7 @@ gen8_dispatch_bsd_engine(struct drm_i915_private *dev_priv,/* Check whether the file_priv has already selected one ring. */ if ((int )file_priv->bsd_engine <0 ) file_priv->bsd_engine = -get_random_int () %num_vcs_engines (dev_priv); +prandom_u32_max (num_vcs_engines (dev_priv));return file_priv->bsd_engine; }
drivers/infiniband/core/cma.c +1 -1
@@ -3807,7 +3807,7 @@ static int cma_alloc_any_port(enum rdma_ucm_port_space ps,inet_get_local_port_range (net, &low, &high); remaining = (high - low) +1 ; - rover =prandom_u32 () % remaining + low; + rover =prandom_u32_max (remaining) + low; retry:if (last_used_port != rover) {struct rdma_bind_list *bind_list;
drivers/infiniband/hw/cxgb4/id_table.c +2 -2
@@ -54,7 +54,7 @@ u32 c4iw_id_alloc(struct c4iw_id_table *alloc)if (obj < alloc->max) {if (alloc->flags &C4IW_ID_TABLE_F_RANDOM ) - alloc->last +=prandom_u32 () %RANDOM_SKIP ; + alloc->last +=prandom_u32_max (RANDOM_SKIP );else alloc->last = obj +1 ;if (alloc->last >= alloc->max)
@@ -85,7 +85,7 @@ int c4iw_id_table_alloc(struct c4iw_id_table *alloc, u32 start, u32 num, alloc->start = start; alloc->flags = flags;if (flags &C4IW_ID_TABLE_F_RANDOM ) - alloc->last =prandom_u32 () %RANDOM_SKIP ; + alloc->last =prandom_u32_max (RANDOM_SKIP );else alloc->last =0 ; alloc->max = num;
drivers/infiniband/hw/hns/hns_roce_ah.c +2 -3
@@ -41,9 +41,8 @@ static inline u16 get_ah_udp_sport(const struct rdma_ah_attr *ah_attr)u16 sport;if (!fl) - sport =get_random_u32 () % - (IB_ROCE_UDP_ENCAP_VALID_PORT_MAX +1 - -IB_ROCE_UDP_ENCAP_VALID_PORT_MIN ) + + sport =prandom_u32_max (IB_ROCE_UDP_ENCAP_VALID_PORT_MAX +1 - +IB_ROCE_UDP_ENCAP_VALID_PORT_MIN ) +IB_ROCE_UDP_ENCAP_VALID_PORT_MIN ;else sport =rdma_flow_label_to_udp_sport (fl);
drivers/infiniband/ulp/rtrs/rtrs-clt.c +1 -2
@@ -1517,8 +1517,7 @@ static void rtrs_clt_err_recovery_work(struct work_struct *work)rtrs_clt_stop_and_destroy_conns (clt_path);queue_delayed_work (rtrs_wq, &clt_path->reconnect_dwork,msecs_to_jiffies (delay_ms + -prandom_u32 () % -RTRS_RECONNECT_SEED )); +prandom_u32_max (RTRS_RECONNECT_SEED ))); } static struct rtrs_clt_path *alloc_path(struct rtrs_clt_sess *clt,
drivers/md/bcache/request.c +1 -1
@@ -401,7 +401,7 @@ static bool check_should_bypass(struct cached_dev *dc, struct bio *bio) }if (bypass_torture_test (dc)) { -if ((get_random_int () &3 ) ==3 ) +if (prandom_u32_max (4 ) ==3 ) goto skip;else goto rescale;
drivers/media/test-drivers/vivid/vivid-touch-cap.c +1 -1
@@ -221,7 +221,7 @@ static void vivid_fill_buff_noise(__s16 *tch_buf, int size)static inline int get_random_pressure (void ) { -return get_random_int () %VIVID_PRESSURE_LIMIT ; +return prandom_u32_max (VIVID_PRESSURE_LIMIT ); } static void vivid_tch_buf_set(struct v4l2_pix_format *f,
drivers/mmc/core/core.c +2 -2
@@ -97,8 +97,8 @@ static void mmc_should_fail_request(struct mmc_host *host, !should_fail(&host->fail_mmc_request, data->blksz * data->blocks)) return; - data->error = data_errors[prandom_u32 () %ARRAY_SIZE (data_errors)]; - data->bytes_xfered = (prandom_u32() % (data->bytes_xfered >> 9)) << 9; + data->error = data_errors[prandom_u32_max (ARRAY_SIZE (data_errors))]; + data->bytes_xfered = prandom_u32_max(data->bytes_xfered >> 9) << 9; }#else /* CONFIG_FAIL_MMC_REQUEST */
drivers/mmc/host/dw_mmc.c +1 -1
@@ -1858,7 +1858,7 @@ static void dw_mci_start_fault_timer(struct dw_mci *host)* Try to inject the error at random points during the data transfer. */ hrtimer_start (&host->fault_timer, -ms_to_ktime (prandom_u32 () %25 ), +ms_to_ktime (prandom_u32_max (25 )),HRTIMER_MODE_REL ); }
drivers/mtd/nand/raw/nandsim.c +2 -2
@@ -1405,9 +1405,9 @@ static void ns_do_bit_flips(struct nandsim *ns, int num)if (bitflips &&prandom_u32 () < (1 <<22 )) {int flips =1 ;if (bitflips >1 ) - flips = (prandom_u32 () % (int ) bitflips) +1 ; + flips =prandom_u32_max (bitflips) +1 ;while (flips--) { -int pos =prandom_u32 () % (num *8 ); +int pos =prandom_u32_max (num *8 ); ns->buf.byte[pos /8 ] ^= (1 << (pos %8 )); NS_WARN("read_page: flipping bit %d in page %d " "reading from %d ecc: corrected=%u failed=%u\n",
drivers/mtd/tests/mtd_nandecctest.c +5 -5
@@ -47,7 +47,7 @@ struct nand_ecc_test {static void single_bit_error_data (void *error_data,void *correct_data,size_t size) { -unsigned int offset =prandom_u32 () % (size *BITS_PER_BYTE ); +unsigned int offset =prandom_u32_max (size *BITS_PER_BYTE );memcpy (error_data, correct_data, size);__change_bit_le (offset, error_data);
@@ -58,9 +58,9 @@ static void double_bit_error_data(void *error_data, void *correct_data, {unsigned int offset[2 ]; - offset[0 ] =prandom_u32 () % (size *BITS_PER_BYTE ); + offset[0 ] =prandom_u32_max (size *BITS_PER_BYTE );do { - offset[1 ] =prandom_u32 () % (size *BITS_PER_BYTE ); + offset[1 ] =prandom_u32_max (size *BITS_PER_BYTE ); }while (offset[0 ] == offset[1 ]);memcpy (error_data, correct_data, size);
@@ -71,7 +71,7 @@ static void double_bit_error_data(void *error_data, void *correct_data,static unsigned int random_ecc_bit (size_t size) { -unsigned int offset =prandom_u32 () % (3 *BITS_PER_BYTE ); +unsigned int offset =prandom_u32_max (3 *BITS_PER_BYTE );if (size ==256 ) {/*
@@ -79,7 +79,7 @@ static unsigned int random_ecc_bit(size_t size)* and 17th bit) in ECC code for 256 byte data block */ while (offset ==16 || offset ==17 ) - offset =prandom_u32 () % (3 *BITS_PER_BYTE ); + offset =prandom_u32_max (3 *BITS_PER_BYTE ); }return offset;
drivers/mtd/tests/stresstest.c +4 -13
@@ -45,9 +45,8 @@ static int rand_eb(void)unsigned int eb; again: - eb =prandom_u32 ();/* Read or write up 2 eraseblocks at a time - hence 'ebcnt - 1' */ - eb %= (ebcnt -1 ); + eb =prandom_u32_max (ebcnt -1 );if (bbt[eb]) goto again;return eb;
@@ -55,20 +54,12 @@ static int rand_eb(void)static int rand_offs (void ) { -unsigned int offs; - - offs =prandom_u32 (); - offs %= bufsize; -return offs; +return prandom_u32_max (bufsize); }static int rand_len (int offs) { -unsigned int len; - - len =prandom_u32 (); - len %= (bufsize - offs); -return len; +return prandom_u32_max (bufsize - offs); }static int do_read (void )
@@ -127,7 +118,7 @@ static int do_write(void)static int do_operation (void ) { -if (prandom_u32 () &1 ) +if (prandom_u32_max (2 ))return do_read ();else return do_write ();
drivers/mtd/ubi/debug.c +1 -1
@@ -590,7 +590,7 @@ int ubi_dbg_power_cut(struct ubi_device *ubi, int caller)if (ubi->dbg.power_cut_max > ubi->dbg.power_cut_min) { range = ubi->dbg.power_cut_max - ubi->dbg.power_cut_min; - ubi->dbg.power_cut_counter +=prandom_u32 () % range; + ubi->dbg.power_cut_counter +=prandom_u32_max (range); }return 0 ; }
drivers/mtd/ubi/debug.h +3 -3
@@ -73,7 +73,7 @@ static inline int ubi_dbg_is_bgt_disabled(const struct ubi_device *ubi)static inline int ubi_dbg_is_bitflip (const struct ubi_device *ubi) {if (ubi->dbg.emulate_bitflips) -return !(prandom_u32 () %200 ); +return !prandom_u32_max (200 );return 0 ; }
@@ -87,7 +87,7 @@ static inline int ubi_dbg_is_bitflip(const struct ubi_device *ubi)static inline int ubi_dbg_is_write_failure (const struct ubi_device *ubi) {if (ubi->dbg.emulate_io_failures) -return !(prandom_u32 () %500 ); +return !prandom_u32_max (500 );return 0 ; }
@@ -101,7 +101,7 @@ static inline int ubi_dbg_is_write_failure(const struct ubi_device *ubi)static inline int ubi_dbg_is_erase_failure (const struct ubi_device *ubi) {if (ubi->dbg.emulate_io_failures) -return !(prandom_u32 () %400 ); +return !prandom_u32_max (400 );return 0 ; }
drivers/net/ethernet/broadcom/cnic.c +1 -2
@@ -4105,8 +4105,7 @@ static int cnic_cm_alloc_mem(struct cnic_dev *dev)for (i =0 ; i <MAX_CM_SK_TBL_SZ ; i++)atomic_set (&cp->csk_tbl[i].ref_count,0 ); - port_id =prandom_u32 (); - port_id %=CNIC_LOCAL_PORT_RANGE ; + port_id =prandom_u32_max (CNIC_LOCAL_PORT_RANGE );if (cnic_init_id_tbl (&cp->csk_port_tbl,CNIC_LOCAL_PORT_RANGE ,CNIC_LOCAL_PORT_MIN , port_id)) {cnic_cm_free_mem (dev);
drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_io.c +2 -2
@@ -919,8 +919,8 @@ static int csk_wait_memory(struct chtls_dev *cdev, current_timeo = *timeo_p; noblock = (*timeo_p ? false : true);if (csk_mem_free (cdev, sk)) { - current_timeo = (prandom_u32 () % (HZ /5 )) +2 ; - vm_wait = (prandom_u32 () % (HZ /5 )) +2 ; + current_timeo =prandom_u32_max (HZ /5 ) +2 ; + vm_wait =prandom_u32_max (HZ /5 ) +2 ; }add_wait_queue (sk_sleep (sk), &wait);
drivers/net/hamradio/baycom_epp.c +1 -1
@@ -438,7 +438,7 @@ static int transmit(struct baycom_state *bc, int cnt, unsigned char stat)if ((--bc->hdlctx.slotcnt) >0 )return 0 ; bc->hdlctx.slotcnt = bc->ch_params.slottime; -if ((prandom_u32 () %256 ) > bc->ch_params.ppersist) +if (prandom_u32_max (256 ) > bc->ch_params.ppersist)return 0 ; } }
drivers/net/hamradio/hdlcdrv.c +1 -1
@@ -377,7 +377,7 @@ void hdlcdrv_arbitrate(struct net_device *dev, struct hdlcdrv_state *s)if ((--s->hdlctx.slotcnt) >0 )return ; s->hdlctx.slotcnt = s->ch_params.slottime; -if ((prandom_u32 () %256 ) > s->ch_params.ppersist) +if (prandom_u32_max (256 ) > s->ch_params.ppersist)return ;start_tx (dev, s); }
drivers/net/hamradio/yam.c +1 -1
@@ -626,7 +626,7 @@ static void yam_arbitrate(struct net_device *dev) yp->slotcnt = yp->slot /10 ;/* is random > persist ? */ -if ((prandom_u32 () %256 ) > yp->pers) +if (prandom_u32_max (256 ) > yp->pers)return ;yam_start_tx (dev, yp);
drivers/net/phy/at803x.c +1 -1
@@ -1758,7 +1758,7 @@ static int qca808x_phy_fast_retrain_config(struct phy_device *phydev)static int qca808x_phy_ms_random_seed_set (struct phy_device *phydev) { -u16 seed_value = (prandom_u32 () %QCA808X_MASTER_SLAVE_SEED_RANGE ); +u16 seed_value =prandom_u32_max (QCA808X_MASTER_SLAVE_SEED_RANGE ); return at803x_debug_reg_mask(phydev, QCA808X_PHY_DEBUG_LOCAL_SEED, QCA808X_MASTER_SLAVE_SEED_CFG,
drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c +1 -1
@@ -1128,7 +1128,7 @@ static void brcmf_p2p_afx_handler(struct work_struct *work)if (afx_hdl->is_listen && afx_hdl->my_listen_chan)/* 100ms ~ 300ms */ err =brcmf_p2p_discover_listen (p2p, afx_hdl->my_listen_chan, -100 * (1 +prandom_u32 () %3 )); +100 * (1 +prandom_u32_max (3 )));else err =brcmf_p2p_act_frm_search (p2p, afx_hdl->peer_listen_chan);
drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c +1 -1
@@ -1099,7 +1099,7 @@ static void iwl_mvm_mac_ctxt_cmd_fill_ap(struct iwl_mvm *mvm, iwl_mvm_mac_ap_iterator, &data);if (data.beacon_device_ts) { -u32 rand = (prandom_u32 () % (64 -36 )) +36 ; +u32 rand =prandom_u32_max (64 -36 ) +36 ; mvmvif->ap_beacon_time = data.beacon_device_ts +ieee80211_tu_to_usec (data.beacon_int * rand /100 );
drivers/scsi/fcoe/fcoe_ctlr.c +2 -2
@@ -2233,7 +2233,7 @@ static void fcoe_ctlr_vn_restart(struct fcoe_ctlr *fip)if (fip->probe_tries <FIP_VN_RLIM_COUNT ) { fip->probe_tries++; - wait =prandom_u32 () %FIP_VN_PROBE_WAIT ; + wait =prandom_u32_max (FIP_VN_PROBE_WAIT ); }else wait =FIP_VN_RLIM_INT ;mod_timer (&fip->timer, jiffies +msecs_to_jiffies (wait));
@@ -3125,7 +3125,7 @@ static void fcoe_ctlr_vn_timeout(struct fcoe_ctlr *fip) fcoe_all_vn2vn, 0); fip->port_ka_time = jiffies +msecs_to_jiffies (FIP_VN_BEACON_INT + - (prandom_u32 () %FIP_VN_BEACON_FUZZ )); +prandom_u32_max (FIP_VN_BEACON_FUZZ )); }if (time_before (fip->port_ka_time, next_time)) next_time = fip->port_ka_time;
drivers/scsi/qedi/qedi_main.c +1 -1
@@ -618,7 +618,7 @@ static int qedi_cm_alloc_mem(struct qedi_ctx *qedi) sizeof(struct qedi_endpoint *)), GFP_KERNEL);if (!qedi->ep_tbl)return -ENOMEM ; - port_id =prandom_u32 () %QEDI_LOCAL_PORT_RANGE ; + port_id =prandom_u32_max (QEDI_LOCAL_PORT_RANGE );if (qedi_init_id_tbl (&qedi->lcl_port_tbl,QEDI_LOCAL_PORT_RANGE ,QEDI_LOCAL_PORT_MIN , port_id)) {qedi_cm_free_mem (qedi);
fs/ceph/inode.c +1 -1
@@ -362,7 +362,7 @@ static int ceph_fill_fragtree(struct inode *inode,if (nsplits != ci->i_fragtree_nsplits) { update = true; }else if (nsplits) { - i =prandom_u32 () % nsplits; + i =prandom_u32_max (nsplits); id =le32_to_cpu (fragtree->splits[i].frag);if (!__ceph_find_frag (ci, id)) update = true;
fs/ceph/mdsmap.c +1 -1
@@ -29,7 +29,7 @@ static int __mdsmap_get_random_mds(struct ceph_mdsmap *m, bool ignore_laggy)return -1 ;/* pick */ - n =prandom_u32 () % n; + n =prandom_u32_max (n);for (j =0 , i =0 ; i < m->possible_max_rank; i++) {if (CEPH_MDS_IS_READY (i, ignore_laggy)) j++;
fs/ext4/super.c +3 -4
@@ -3782,8 +3782,7 @@ static int ext4_lazyinit_thread(void *arg) }if (!progress) { elr->lr_next_sched = jiffies + - (prandom_u32 () - % (EXT4_DEF_LI_MAX_START_DELAY *HZ )); +prandom_u32_max (EXT4_DEF_LI_MAX_START_DELAY *HZ ); }if (time_before (elr->lr_next_sched, next_wakeup)) next_wakeup = elr->lr_next_sched;
@@ -3930,8 +3929,8 @@ static struct ext4_li_request *ext4_li_request_new(struct super_block *sb,* spread the inode table initialization requests * better. */ - elr->lr_next_sched = jiffies + (prandom_u32 () % - (EXT4_DEF_LI_MAX_START_DELAY *HZ )); + elr->lr_next_sched = jiffies +prandom_u32_max ( +EXT4_DEF_LI_MAX_START_DELAY *HZ );return elr; }
fs/f2fs/gc.c +1 -1
@@ -285,7 +285,7 @@ static void select_policy(struct f2fs_sb_info *sbi, int gc_type,/* let's select beginning hot/small space first in no_heap mode*/ if (f2fs_need_rand_seg (sbi)) - p->offset =prandom_u32 () % (MAIN_SECS (sbi) * sbi->segs_per_sec); + p->offset =prandom_u32_max (MAIN_SECS (sbi) * sbi->segs_per_sec);else if (test_opt (sbi,NOHEAP ) && (type ==CURSEG_HOT_DATA ||IS_NODESEG (type))) p->offset =0 ;
fs/f2fs/segment.c +4 -4
@@ -2535,7 +2535,7 @@ static unsigned int __get_next_segno(struct f2fs_sb_info *sbi, int type)sanity_check_seg_type (sbi, seg_type);if (f2fs_need_rand_seg (sbi)) -return prandom_u32 () % (MAIN_SECS (sbi) * sbi->segs_per_sec); +return prandom_u32_max (MAIN_SECS (sbi) * sbi->segs_per_sec);/* if segs_per_sec is large than 1, we need to keep original policy. */ if (__is_large_section (sbi))
@@ -2589,7 +2589,7 @@ static void new_curseg(struct f2fs_sb_info *sbi, int type, bool new_sec) curseg->alloc_type =LFS ;if (F2FS_OPTION (sbi).fs_mode ==FS_MODE_FRAGMENT_BLK ) curseg->fragment_remained_chunk = -prandom_u32 () % sbi->max_fragment_chunk +1 ; +prandom_u32_max (sbi->max_fragment_chunk) +1 ; } static int __next_free_blkoff(struct f2fs_sb_info *sbi,
@@ -2626,9 +2626,9 @@ static void __refresh_next_blkoff(struct f2fs_sb_info *sbi,/* To allocate block chunks in different sizes, use random number */ if (--seg->fragment_remained_chunk <=0 ) { seg->fragment_remained_chunk = -prandom_u32 () % sbi->max_fragment_chunk +1 ; +prandom_u32_max (sbi->max_fragment_chunk) +1 ; seg->next_blkoff += -prandom_u32 () % sbi->max_fragment_hole +1 ; +prandom_u32_max (sbi->max_fragment_hole) +1 ; } } }
fs/ubifs/debug.c +4 -4
@@ -2467,7 +2467,7 @@ int dbg_check_nondata_nodes_order(struct ubifs_info *c, struct list_head *head)static inline int chance (unsigned int n,unsigned int out_of) { -return !!((prandom_u32 () % out_of) +1 <= n); +return !!(prandom_u32_max (out_of) +1 <= n); }
@@ -2485,13 +2485,13 @@ static int power_cut_emulated(struct ubifs_info *c, int lnum, int write)if (chance (1 ,2 )) { d->pc_delay =1 ;/* Fail within 1 minute */ - delay =prandom_u32 () %60000 ; + delay =prandom_u32_max (60000 ); d->pc_timeout = jiffies; d->pc_timeout +=msecs_to_jiffies (delay);ubifs_warn (c,"failing after %lums" , delay); }else { d->pc_delay =2 ; - delay =prandom_u32 () %10000 ; + delay =prandom_u32_max (10000 );/* Fail within 10000 operations */ d->pc_cnt_max = delay;ubifs_warn (c,"failing after %lu calls" , delay);
@@ -2571,7 +2571,7 @@ static int corrupt_data(const struct ubifs_info *c, const void *buf,unsigned int from, to, ffs =chance (1 ,2 );unsigned char *p = (void *)buf; - from =prandom_u32 () % len; + from =prandom_u32_max (len);/* Corruption span max to end of write unit */ to =min (len,ALIGN (from +1 , c->max_write_size));
fs/ubifs/lpt_commit.c +7 -7
@@ -1970,28 +1970,28 @@ static int dbg_populate_lsave(struct ubifs_info *c)if (!dbg_is_chk_gen (c))return 0 ; -if (prandom_u32 () &3 ) +if (prandom_u32_max (4 ))return 0 ;for (i =0 ; i < c->lsave_cnt; i++) c->lsave[i] = c->main_first;list_for_each_entry (lprops, &c->empty_list, list) - c->lsave[prandom_u32 () % c->lsave_cnt] = lprops->lnum; + c->lsave[prandom_u32_max (c->lsave_cnt)] = lprops->lnum;list_for_each_entry (lprops, &c->freeable_list, list) - c->lsave[prandom_u32 () % c->lsave_cnt] = lprops->lnum; + c->lsave[prandom_u32_max (c->lsave_cnt)] = lprops->lnum;list_for_each_entry (lprops, &c->frdi_idx_list, list) - c->lsave[prandom_u32 () % c->lsave_cnt] = lprops->lnum; + c->lsave[prandom_u32_max (c->lsave_cnt)] = lprops->lnum; heap = &c->lpt_heap[LPROPS_DIRTY_IDX -1 ];for (i =0 ; i < heap->cnt; i++) - c->lsave[prandom_u32 () % c->lsave_cnt] = heap->arr[i]->lnum; + c->lsave[prandom_u32_max (c->lsave_cnt)] = heap->arr[i]->lnum; heap = &c->lpt_heap[LPROPS_DIRTY -1 ];for (i =0 ; i < heap->cnt; i++) - c->lsave[prandom_u32 () % c->lsave_cnt] = heap->arr[i]->lnum; + c->lsave[prandom_u32_max (c->lsave_cnt)] = heap->arr[i]->lnum; heap = &c->lpt_heap[LPROPS_FREE -1 ];for (i =0 ; i < heap->cnt; i++) - c->lsave[prandom_u32 () % c->lsave_cnt] = heap->arr[i]->lnum; + c->lsave[prandom_u32_max (c->lsave_cnt)] = heap->arr[i]->lnum;return 1 ; }
fs/ubifs/tnc_commit.c +1 -1
@@ -700,7 +700,7 @@ static int alloc_idx_lebs(struct ubifs_info *c, int cnt) c->ilebs[c->ileb_cnt++] = lnum;dbg_cmt ("LEB %d" , lnum); } -if (dbg_is_chk_index (c) && !(prandom_u32 () &7 )) +if (dbg_is_chk_index (c) && !prandom_u32_max (8 ))return -ENOSPC ;return 0 ; }
fs/xfs/libxfs/xfs_alloc.c +1 -1
@@ -1520,7 +1520,7 @@ xfs_alloc_ag_vextent_lastblock(#ifdef DEBUG /* Randomly don't execute the first algorithm. */ -if (prandom_u32 () &1 ) +if (prandom_u32_max (2 ))return 0 ;#endif
fs/xfs/libxfs/xfs_ialloc.c +1 -1
@@ -636,7 +636,7 @@ xfs_ialloc_ag_alloc(/* randomly do sparse inode allocations */ if (xfs_has_sparseinodes (tp->t_mountp) && igeo->ialloc_min_blks < igeo->ialloc_blks) - do_sparse =prandom_u32 () &1 ; + do_sparse =prandom_u32_max (2 );#endif /*
fs/xfs/xfs_error.c +1 -1
@@ -274,7 +274,7 @@ xfs_errortag_test(ASSERT (error_tag <XFS_ERRTAG_MAX ); randfactor = mp->m_errortag[error_tag]; -if (!randfactor ||prandom_u32 () % randfactor) +if (!randfactor ||prandom_u32_max (randfactor))return false; xfs_warn_ratelimited(mp,
include/linux/nodemask.h +1 -1
@@ -509,7 +509,7 @@ static inline int node_random(const nodemask_t *maskp) w =nodes_weight (*maskp);if (w) bit =bitmap_ord_to_pos (maskp->bits, -get_random_int () % w,MAX_NUMNODES ); +prandom_u32_max (w),MAX_NUMNODES );return bit;#else return 0 ;
kernel/bpf/core.c +2 -2
@@ -1032,7 +1032,7 @@ bpf_jit_binary_alloc(unsigned int proglen, u8 **image_ptr, hdr->size = size; hole = min_t(unsigned int, size - (proglen + sizeof(*hdr)),PAGE_SIZE -sizeof (*hdr)); - start = (get_random_int () % hole) & ~(alignment -1 ); + start =prandom_u32_max (hole) & ~(alignment -1 );/* Leave a random number of instructions before BPF code. */ *image_ptr = &hdr->image[start];
@@ -1094,7 +1094,7 @@ bpf_jit_binary_pack_alloc(unsigned int proglen, u8 **image_ptr, hole = min_t(unsigned int, size - (proglen + sizeof(*ro_header)),BPF_PROG_CHUNK_SIZE -sizeof (*ro_header)); - start = (get_random_int () % hole) & ~(alignment -1 ); + start =prandom_u32_max (hole) & ~(alignment -1 ); *image_ptr = &ro_header->image[start]; *rw_image = &(*rw_header)->image[start];
kernel/locking/test-ww_mutex.c +2 -2
@@ -399,7 +399,7 @@ static int *get_random_order(int count) order[n] = n;for (n = count -1 ; n >1 ; n--) { - r =get_random_int () % (n +1 ); + r =prandom_u32_max (n +1 );if (r != n) { tmp = order[n]; order[n] = order[r];
@@ -538,7 +538,7 @@ static void stress_one_work(struct work_struct *work) {struct stress *stress =container_of (work,typeof (*stress), work);const int nlocks = stress->nlocks; -struct ww_mutex *lock = stress->locks + (get_random_int () % nlocks); +struct ww_mutex *lock = stress->locks +prandom_u32_max (nlocks);int err; do {
kernel/time/clocksource.c +1 -1
@@ -310,7 +310,7 @@ static void clocksource_verify_choose_cpus(void)* CPUs that are currently online. */ for (i =1 ; i < n; i++) { - cpu =prandom_u32 () % nr_cpu_ids; + cpu =prandom_u32_max (nr_cpu_ids); cpu =cpumask_next (cpu -1 , cpu_online_mask);if (cpu >= nr_cpu_ids) cpu =cpumask_first (cpu_online_mask);
lib/fault-inject.c +1 -1
@@ -139,7 +139,7 @@ bool should_fail(struct fault_attr *attr, ssize_t size)return false; } -if (attr->probability <=prandom_u32 () %100 ) +if (attr->probability <=prandom_u32_max (100 ))return false;if (!fail_stacktrace (attr))
lib/find_bit_benchmark.c +2 -2
@@ -157,8 +157,8 @@ static int __init find_bit_test(void)bitmap_zero (bitmap2,BITMAP_LEN );while (nbits--) { -__set_bit (prandom_u32 () %BITMAP_LEN , bitmap); -__set_bit (prandom_u32 () %BITMAP_LEN , bitmap2); +__set_bit (prandom_u32_max (BITMAP_LEN ), bitmap); +__set_bit (prandom_u32_max (BITMAP_LEN ), bitmap2); }test_find_next_bit (bitmap,BITMAP_LEN );
lib/kobject.c +1 -1
@@ -694,7 +694,7 @@ static void kobject_release(struct kref *kref) { struct kobject *kobj = container_of(kref, struct kobject, kref);#ifdef CONFIG_DEBUG_KOBJECT_RELEASE -unsigned long delay =HZ +HZ * (get_random_int () &0x3 ); +unsigned long delay =HZ +HZ *prandom_u32_max (4 );pr_info ("kobject: '%s' (%p): %s, parent %p (delayed %ld)\n" ,kobject_name (kobj), kobj, __func__, kobj->parent, delay);INIT_DELAYED_WORK (&kobj->release, kobject_delayed_cleanup);
lib/reed_solomon/test_rslib.c +3 -3
@@ -183,7 +183,7 @@ static int get_rcw_we(struct rs_control *rs, struct wspace *ws,do {/* Must not choose the same location twice */ - errloc =prandom_u32 () % len; + errloc =prandom_u32_max (len); }while (errlocs[errloc] !=0 ); errlocs[errloc] =1 ;
@@ -194,12 +194,12 @@ static int get_rcw_we(struct rs_control *rs, struct wspace *ws,for (i =0 ; i < eras; i++) {do {/* Must not choose the same location twice */ - errloc =prandom_u32 () % len; + errloc =prandom_u32_max (len); }while (errlocs[errloc] !=0 ); derrlocs[i] = errloc; -if (ewsc && (prandom_u32 () &1 )) { +if (ewsc &&prandom_u32_max (2 )) {/* Erasure with the symbol intact */ errlocs[errloc] =2 ; }else {
lib/sbitmap.c +1 -1
@@ -33,7 +33,7 @@ static inline unsigned update_alloc_hint_before_get(struct sbitmap *sb, hint =this_cpu_read (*sb->alloc_hint);if (unlikely (hint >= depth)) { - hint = depth ?prandom_u32 () % depth :0 ; + hint = depth ?prandom_u32_max (depth) :0 ;this_cpu_write (*sb->alloc_hint, hint); }
lib/test-string_helpers.c +1 -1
@@ -587,7 +587,7 @@ static int __init test_string_helpers_init(void)for (i =0 ; i <UNESCAPE_ALL_MASK +1 ; i++)test_string_unescape ("unescape" , i, false);test_string_unescape ("unescape inplace" , -get_random_int () % (UNESCAPE_ANY +1 ), true); +prandom_u32_max (UNESCAPE_ANY +1 ), true);/* Without dictionary */ for (i =0 ; i <ESCAPE_ALL_MASK +1 ; i++)
lib/test_hexdump.c +5 -5
@@ -149,7 +149,7 @@ static void __init test_hexdump(size_t len, int rowsize, int groupsize,static void __init test_hexdump_set (int rowsize,bool ascii) {size_t d =min_t (size_t,sizeof (data_b), rowsize); -size_t len =get_random_int () % d +1 ; +size_t len =prandom_u32_max (d) +1 ;test_hexdump (len, rowsize,4 , ascii);test_hexdump (len, rowsize,2 , ascii);
@@ -208,11 +208,11 @@ static void __init test_hexdump_overflow(size_t buflen, size_t len,static void __init test_hexdump_overflow_set (size_t buflen,bool ascii) {unsigned int i =0 ; -int rs = (get_random_int () %2 +1 ) *16 ; +int rs = (prandom_u32_max (2 ) +1 ) *16 ;do {int gs =1 << i; -size_t len =get_random_int () % rs + gs; +size_t len =prandom_u32_max (rs) + gs;test_hexdump_overflow (buflen,rounddown (len, gs), rs, gs, ascii); }while (i++ <3 );
@@ -223,11 +223,11 @@ static int __init test_hexdump_init(void)unsigned int i;int rowsize; - rowsize = (get_random_int () %2 +1 ) *16 ; + rowsize = (prandom_u32_max (2 ) +1 ) *16 ;for (i =0 ; i <16 ; i++)test_hexdump_set (rowsize, false); - rowsize = (get_random_int () %2 +1 ) *16 ; + rowsize = (prandom_u32_max (2 ) +1 ) *16 ;for (i =0 ; i <16 ; i++)test_hexdump_set (rowsize, true);
lib/test_kasan.c +3 -3
@@ -1269,7 +1269,7 @@ static void match_all_not_assigned(struct kunit *test)KASAN_TEST_NEEDS_CONFIG_OFF (test,CONFIG_KASAN_GENERIC );for (i =0 ; i <256 ; i++) { - size = (get_random_int () %1024 ) +1 ; + size =prandom_u32_max (1024 ) +1 ; ptr =kmalloc (size,GFP_KERNEL );KUNIT_ASSERT_NOT_ERR_OR_NULL (test, ptr);KUNIT_EXPECT_GE (test, (u8 )get_tag (ptr), (u8 )KASAN_TAG_MIN );
@@ -1278,7 +1278,7 @@ static void match_all_not_assigned(struct kunit *test) }for (i =0 ; i <256 ; i++) { - order = (get_random_int () %4 ) +1 ; + order =prandom_u32_max (4 ) +1 ; pages =alloc_pages (GFP_KERNEL , order); ptr =page_address (pages);KUNIT_ASSERT_NOT_ERR_OR_NULL (test, ptr);
@@ -1291,7 +1291,7 @@ static void match_all_not_assigned(struct kunit *test)return ;for (i =0 ; i <256 ; i++) { - size = (get_random_int () %1024 ) +1 ; + size =prandom_u32_max (1024 ) +1 ; ptr =vmalloc (size);KUNIT_ASSERT_NOT_ERR_OR_NULL (test, ptr);KUNIT_EXPECT_GE (test, (u8 )get_tag (ptr), (u8 )KASAN_TAG_MIN );
lib/test_list_sort.c +1 -1
@@ -71,7 +71,7 @@ static void list_sort_test(struct kunit *test)KUNIT_ASSERT_NOT_ERR_OR_NULL (test, el);/* force some equivalencies */ - el->value =prandom_u32 () % (TEST_LIST_LEN /3 ); + el->value =prandom_u32_max (TEST_LIST_LEN /3 ); el->serial = i; el->poison1 =TEST_POISON1 ; el->poison2 =TEST_POISON2 ;
mm/migrate.c +1 -1
@@ -2292,7 +2292,7 @@ int next_demotion_node(int node)* caching issue, which seems more complicated. So selecting * target node randomly seems better until now. */ - index =get_random_int () % target_nr; + index =prandom_u32_max (target_nr);break ; }
mm/slub.c +1 -1
@@ -1868,7 +1868,7 @@ static bool shuffle_freelist(struct kmem_cache *s, struct slab *slab)return false; freelist_count =oo_objects (s->oo); - pos =get_random_int () % freelist_count; + pos =prandom_u32_max (freelist_count); page_limit = slab->objects * s->size; start =fixup_red_left (s,slab_address (slab));
net/802/garp.c +1 -1
@@ -407,7 +407,7 @@ static void garp_join_timer_arm(struct garp_applicant *app) {unsigned long delay; - delay = (u64 )msecs_to_jiffies (garp_join_time) *prandom_u32 () >>32 ; + delay =prandom_u32_max (msecs_to_jiffies (garp_join_time));mod_timer (&app->join_timer, jiffies + delay); }
net/802/mrp.c +1 -1
@@ -592,7 +592,7 @@ static void mrp_join_timer_arm(struct mrp_applicant *app) {unsigned long delay; - delay = (u64 )msecs_to_jiffies (mrp_join_time) *prandom_u32 () >>32 ; + delay =prandom_u32_max (msecs_to_jiffies (mrp_join_time));mod_timer (&app->join_timer, jiffies + delay); }
net/ceph/mon_client.c +1 -1
@@ -222,7 +222,7 @@ static void pick_new_mon(struct ceph_mon_client *monc) max--; } - n =prandom_u32 () % max; + n =prandom_u32_max (max);if (o >=0 && n >= o) n++;
net/ceph/osd_client.c +1 -1
@@ -1479,7 +1479,7 @@ static bool target_should_be_paused(struct ceph_osd_client *osdc,static int pick_random_replica (const struct ceph_osds *acting) { -int i =prandom_u32 () % acting->size; +int i =prandom_u32_max (acting->size);dout ("%s picked osd%d, primary osd%d\n" , __func__, acting->osds[i], acting->primary);
net/core/neighbour.c +1 -1
@@ -111,7 +111,7 @@ static void neigh_cleanup_and_release(struct neighbour *neigh)unsigned long neigh_rand_reach_time (unsigned long base) { -return base ? (prandom_u32 () % base) + (base >>1 ) :0 ; +return base ?prandom_u32_max (base) + (base >>1 ) :0 ; }EXPORT_SYMBOL (neigh_rand_reach_time);
net/core/pktgen.c +21 -22
110 lines not on this page · raw message
net/core/stream.c +1 -1
@@ -123,7 +123,7 @@ int sk_stream_wait_memory(struct sock *sk, long *timeo_p)DEFINE_WAIT_FUNC (wait, woken_wake_function);if (sk_stream_memory_free (sk)) - current_timeo = vm_wait = (prandom_u32 () % (HZ /5 )) +2 ; + current_timeo = vm_wait =prandom_u32_max (HZ /5 ) +2 ;add_wait_queue (sk_sleep (sk), &wait);
net/ipv4/igmp.c +3 -3
@@ -213,7 +213,7 @@ static void igmp_stop_timer(struct ip_mc_list *im)/* It must be called with locked im->lock */ static void igmp_start_timer (struct ip_mc_list *im,int max_delay) { -int tv =prandom_u32 () % max_delay; +int tv =prandom_u32_max (max_delay); im->tm_running =1 ;if (!mod_timer (&im->timer, jiffies+tv+2 ))
@@ -222,7 +222,7 @@ static void igmp_start_timer(struct ip_mc_list *im, int max_delay)static void igmp_gq_start_timer (struct in_device *in_dev) { -int tv =prandom_u32 () % in_dev->mr_maxdelay; +int tv =prandom_u32_max (in_dev->mr_maxdelay);unsigned long exp = jiffies + tv +2 ; if (in_dev->mr_gq_running &&
@@ -236,7 +236,7 @@ static void igmp_gq_start_timer(struct in_device *in_dev)static void igmp_ifc_start_timer (struct in_device *in_dev,int delay) { -int tv =prandom_u32 () % delay; +int tv =prandom_u32_max (delay);if (!mod_timer (&in_dev->mr_ifc_timer, jiffies+tv+2 ))in_dev_hold (in_dev);
net/ipv4/inet_connection_sock.c +1 -1
@@ -314,7 +314,7 @@ inet_csk_find_open_port(const struct sock *sk, struct inet_bind_bucket **tb_ret,if (likely (remaining >1 )) remaining &= ~1U ; - offset =prandom_u32 () % remaining; + offset =prandom_u32_max (remaining);/* __inet_hash_connect() favors ports having @low parity * We do the opposite to not pollute connect() users. */
net/ipv4/inet_hashtables.c +1 -1
@@ -1037,7 +1037,7 @@ int __inet_hash_connect(struct inet_timewait_death_row *death_row,* on low contention the randomness is maximal and on high contention * it may be inexistent. */ - i =max_t (int, i, (prandom_u32 () &7 ) *2 ); + i =max_t (int, i,prandom_u32_max (8 ) *2 );WRITE_ONCE (table_perturb[index],READ_ONCE (table_perturb[index]) + i +2 );/* Head lock still held and bh's disabled */
net/ipv6/addrconf.c +4 -4
@@ -104,7 +104,7 @@ static inline u32 cstamp_delta(unsigned long cstamp)static inline s32 rfc3315_s14_backoff_init (s32 irt) {/* multiply 'initial retransmission time' by 0.9 .. 1.1 */ -u64 tmp = (900000 +prandom_u32 () %200001 ) * (u64 )irt; +u64 tmp = (900000 +prandom_u32_max (200001 )) * (u64 )irt;do_div (tmp,1000000 );return (s32 )tmp; }
@@ -112,11 +112,11 @@ static inline s32 rfc3315_s14_backoff_init(s32 irt)static inline s32 rfc3315_s14_backoff_update (s32 rt,s32 mrt) {/* multiply 'retransmission timeout' by 1.9 .. 2.1 */ -u64 tmp = (1900000 +prandom_u32 () %200001 ) * (u64 )rt; +u64 tmp = (1900000 +prandom_u32_max (200001 )) * (u64 )rt;do_div (tmp,1000000 );if ((s32 )tmp > mrt) {/* multiply 'maximum retransmission time' by 0.9 .. 1.1 */ - tmp = (900000 +prandom_u32 () %200001 ) * (u64 )mrt; + tmp = (900000 +prandom_u32_max (200001 )) * (u64 )mrt;do_div (tmp,1000000 ); }return (s32 )tmp;
@@ -3967,7 +3967,7 @@ static void addrconf_dad_kick(struct inet6_ifaddr *ifp)if (ifp->flags &IFA_F_OPTIMISTIC ) rand_num =0 ;else - rand_num =prandom_u32 () % (idev->cnf.rtr_solicit_delay ? :1 ); + rand_num =prandom_u32_max (idev->cnf.rtr_solicit_delay ?:1 ); nonce =0 ; if (idev->cnf.enhanced_dad ||
net/ipv6/mcast.c +5 -5
@@ -1050,7 +1050,7 @@ bool ipv6_chk_mcast_addr(struct net_device *dev, const struct in6_addr *group,/* called with mc_lock */ static void mld_gq_start_work (struct inet6_dev *idev) { -unsigned long tv =prandom_u32 () % idev->mc_maxdelay; +unsigned long tv =prandom_u32_max (idev->mc_maxdelay); idev->mc_gq_running =1 ;if (!mod_delayed_work (mld_wq, &idev->mc_gq_work, tv +2 ))
@@ -1068,7 +1068,7 @@ static void mld_gq_stop_work(struct inet6_dev *idev)/* called with mc_lock */ static void mld_ifc_start_work (struct inet6_dev *idev,unsigned long delay) { -unsigned long tv =prandom_u32 () % delay; +unsigned long tv =prandom_u32_max (delay);if (!mod_delayed_work (mld_wq, &idev->mc_ifc_work, tv +2 ))in6_dev_hold (idev);
@@ -1085,7 +1085,7 @@ static void mld_ifc_stop_work(struct inet6_dev *idev)/* called with mc_lock */ static void mld_dad_start_work (struct inet6_dev *idev,unsigned long delay) { -unsigned long tv =prandom_u32 () % delay; +unsigned long tv =prandom_u32_max (delay);if (!mod_delayed_work (mld_wq, &idev->mc_dad_work, tv +2 ))in6_dev_hold (idev);
@@ -1130,7 +1130,7 @@ static void igmp6_group_queried(struct ifmcaddr6 *ma, unsigned long resptime) }if (delay >= resptime) - delay =prandom_u32 () % resptime; + delay =prandom_u32_max (resptime);if (!mod_delayed_work (mld_wq, &ma->mca_work, delay))refcount_inc (&ma->mca_refcnt);
@@ -2574,7 +2574,7 @@ static void igmp6_join_group(struct ifmcaddr6 *ma)igmp6_send (&ma->mca_addr, ma->idev->dev,ICMPV6_MGM_REPORT ); - delay =prandom_u32 () %unsolicited_report_interval (ma->idev); + delay =prandom_u32_max (unsolicited_report_interval (ma->idev));if (cancel_delayed_work (&ma->mca_work)) {refcount_dec (&ma->mca_refcnt);
net/netfilter/ipvs/ip_vs_twos.c +2 -2
@@ -71,8 +71,8 @@ static struct ip_vs_dest *ip_vs_twos_schedule(struct ip_vs_service *svc,* from 0 to total_weight */ total_weight +=1 ; - rweight1 =prandom_u32 () % total_weight; - rweight2 =prandom_u32 () % total_weight; + rweight1 =prandom_u32_max (total_weight); + rweight2 =prandom_u32_max (total_weight);/* Pick two weighted servers */ list_for_each_entry_rcu (dest, &svc->destinations, n_list) {
net/packet/af_packet.c +1 -1
@@ -1350,7 +1350,7 @@ static bool fanout_flow_is_huge(struct packet_sock *po, struct sk_buff *skb)if (READ_ONCE (history[i]) == rxhash) count++; - victim =prandom_u32 () %ROLLOVER_HLEN ; + victim =prandom_u32_max (ROLLOVER_HLEN );/* Avoid dirtying the cache line if possible */ if (READ_ONCE (history[victim]) != rxhash)
net/sched/act_gact.c +1 -1
@@ -25,7 +25,7 @@ static struct tc_action_ops act_gact_ops;static int gact_net_rand (struct tcf_gact *gact) {smp_rmb ();/* coupled with smp_wmb() in tcf_gact_init() */ -if (prandom_u32 () % gact->tcfg_pval) +if (prandom_u32_max (gact->tcfg_pval))return gact->tcf_action;return gact->tcfg_paction; }
net/sched/act_sample.c +1 -1
@@ -168,7 +168,7 @@ static int tcf_sample_act(struct sk_buff *skb, const struct tc_action *a, psample_group =rcu_dereference_bh (s->psample_group);/* randomly sample packets according to rate */ -if (psample_group && (prandom_u32 () % s->rate ==0 )) { +if (psample_group && (prandom_u32_max (s->rate) ==0 )) {if (!skb_at_tc_ingress (skb)) { md.in_ifindex = skb->skb_iif; md.out_ifindex = skb->dev->ifindex;
net/sched/sch_netem.c +2 -2
@@ -513,8 +513,8 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch, goto finish_segs; } - skb->data[prandom_u32 () %skb_headlen (skb)] ^= -1 <<(prandom_u32 () %8 ); + skb->data[prandom_u32_max (skb_headlen (skb))] ^= +1 <<prandom_u32_max (8 ); }if (unlikely (sch->q.qlen >= sch->limit)) {
net/sctp/socket.c +1 -1
@@ -8319,7 +8319,7 @@ static int sctp_get_port_local(struct sock *sk, union sctp_addr *addr)inet_get_local_port_range (net, &low, &high); remaining = (high - low) +1 ; - rover =prandom_u32 () % remaining + low; + rover =prandom_u32_max (remaining) + low; do { rover++;
net/sunrpc/cache.c +1 -1
@@ -677,7 +677,7 @@ static void cache_limit_defers(void)/* Consider removing either the first or the last */ if (cache_defer_cnt >DFR_MAX ) { -if (prandom_u32 () &1 ) +if (prandom_u32_max (2 )) discard =list_entry (cache_defer_list.next, struct cache_deferred_req, recent);else
net/sunrpc/xprtsock.c +1 -1
@@ -1619,7 +1619,7 @@ static int xs_get_random_port(void)if (max < min)return -EADDRINUSE ; range = max - min +1 ; - rand = (unsigned short )prandom_u32 () % range; + rand =prandom_u32_max (range);return rand + min; }
net/tipc/socket.c +1 -1
@@ -3010,7 +3010,7 @@ static int tipc_sk_insert(struct tipc_sock *tsk)struct net *net =sock_net (sk);struct tipc_net *tn =net_generic (net, tipc_net_id);u32 remaining = (TIPC_MAX_PORT -TIPC_MIN_PORT ) +1 ; -u32 portid =prandom_u32 () % remaining +TIPC_MIN_PORT ; +u32 portid =prandom_u32_max (remaining) +TIPC_MIN_PORT ;while (remaining--) { portid++;
net/xfrm/xfrm_state.c +1 -1
@@ -2072,7 +2072,7 @@ int xfrm_alloc_spi(struct xfrm_state *x, u32 low, u32 high) }else {u32 spi =0 ;for (h =0 ; h < high-low+1 ; h++) { - spi = low +prandom_u32 ()%(high-low+1 ); + spi = low +prandom_u32_max (high - low +1 ); x0 =xfrm_state_lookup (net, mark, &x->id.daddr,htonl (spi), x->id.proto, x->props.family);if (x0 ==NULL ) { newspi =htonl (spi);
Signature · 7 lines
2.37.3 _______________________________________________ linux-um mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-um
Re: [PATCH v6 1/7] treewide: use prandom_u32_max() when possible, part 1
Quoted 3 lines · Jason A. Donenfeld
Rather than incurring a division or requesting too many random bytes for the given range, use the
prandom_u32_max()function, which only takes the minimum required bytes from the RNG and avoids divisions. This was
...
Quoted 9 lines
Reviewed-by Greg Kroah-Hartman <[email protected]>Reviewed-by Kees Cook <[email protected]>Reviewed-by Yury Norov <[email protected]>Reviewed-by KP Singh <[email protected]>Signed-off-by Jason A. Donenfeld <[email protected]>
Quoted 3 lines
--- arch/s390/kernel/process.c | 2 +- arch/s390/kernel/vdso.c | 2 +-
For s390:
_______________________________________________
linux-um mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-um
Jason A. Donenfeld
maintainerPATCH v6 2/7 treewide: use prandom_u32_max() when possible, part 2
In reply to Jason A. DonenfeldRather than incurring a division or requesting too many random bytes for the given range, use the prandom_u32_max() function, which only takes the minimum required bytes from the RNG and avoids divisions. This was done by hand, covering things that coccinelle could not do on its own.
--- fs/ext2/ialloc.c | 3 +-- fs/ext4/ialloc.c | 5 ++--- lib/sbitmap.c | 2 +- lib/test_vmalloc.c | 17 ++++------------- 4 files changed, 8 insertions(+), 19 deletions(-)
fs/ext2/ialloc.c +1 -2
@@ -277,8 +277,7 @@ static int find_group_orlov(struct super_block *sb, struct inode *parent)int best_ndir = inodes_per_group;int best_group =-1 ; - group =prandom_u32 (); - parent_group = (unsigned )group % ngroups; + parent_group =prandom_u32_max (ngroups);for (i =0 ; i < ngroups; i++) { group = (parent_group + i) % ngroups; desc =ext2_get_group_desc (sb, group,NULL );
fs/ext4/ialloc.c +2 -3
@@ -463,10 +463,9 @@ static int find_group_orlov(struct super_block *sb, struct inode *parent, hinfo.hash_version =DX_HASH_HALF_MD4 ; hinfo.seed = sbi->s_hash_seed;ext4fs_dirhash (parent, qstr->name, qstr->len, &hinfo); - grp = hinfo.hash; + parent_group = hinfo.hash % ngroups; }else - grp =prandom_u32 (); - parent_group = (unsigned )grp % ngroups; + parent_group =prandom_u32_max (ngroups);for (i =0 ; i < ngroups; i++) { g = (parent_group + i) % ngroups;get_orlov_stats (sb, g, flex_size, &stats);
lib/sbitmap.c +1 -1
@@ -21,7 +21,7 @@ static int init_alloc_hint(struct sbitmap *sb, gfp_t flags)int i;for_each_possible_cpu (i) - *per_cpu_ptr (sb->alloc_hint, i) =prandom_u32 () % depth; + *per_cpu_ptr (sb->alloc_hint, i) =prandom_u32_max (depth); }return 0 ; }
lib/test_vmalloc.c +4 -13
@@ -151,9 +151,7 @@ static int random_size_alloc_test(void)int i;for (i =0 ; i < test_loop_count; i++) { - n =prandom_u32 (); - n = (n %100 ) +1 ; - + n =prandom_u32_max (100 ) +1 ; p =vmalloc (n *PAGE_SIZE );if (!p)
@@ -293,16 +291,12 @@ pcpu_alloc_test(void)return -1 ;for (i =0 ; i <35000 ; i++) { -unsigned int r; - - r =prandom_u32 (); - size = (r % (PAGE_SIZE /4 )) +1 ; + size =prandom_u32_max (PAGE_SIZE /4 ) +1 ;/* * Maximum PAGE_SIZE */ - r =prandom_u32 (); - align =1 << ((r %11 ) +1 ); + align =1 << (prandom_u32_max (11 ) +1 ); pcpu[i] =__alloc_percpu (size, align);if (!pcpu[i])
@@ -393,14 +387,11 @@ static struct test_driver {static void shuffle_array (int *arr,int n) { -unsigned int rnd;int i, j;for (i = n -1 ; i >0 ; i--) { - rnd =prandom_u32 (); -/* Cut the range. */ - j = rnd % i; + j =prandom_u32_max (i);/* Swap indexes. */ swap (arr[i], arr[j]);
Signature · 7 lines
2.37.3 _______________________________________________ linux-um mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-um
Jason A. Donenfeld
maintainerPATCH v6 3/7 treewide: use get_random_{u8,u16}() when possible, part 1
In reply to Jason A. DonenfeldRather than truncate a 32-bit value to a 16-bit value or an 8-bit value, simply use the get_random_{u8,u16}() functions, which are faster than wasting the additional bytes from a 32-bit value. This was done mechanically with this coccinelle script:
@@
expression E;
identifier get_random_u32 =~ "get_random_int|prandom_u32|get_random_u32"; typedef u16;
typedef __be16;
typedef __le16;
typedef u8;
@@
(
- (get_random_u32() & 0xffff)
+ get_random_u16()
|
- (get_random_u32() & 0xff)
+ get_random_u8()
|
- (get_random_u32() % 65536)
+ get_random_u16()
|
- (get_random_u32() % 256)
+ get_random_u8()
|
- (get_random_u32() >> 16)
+ get_random_u16()
|
- (get_random_u32() >> 24)
+ get_random_u8()
|
- (u16)get_random_u32()
+ get_random_u16()
|
- (u8)get_random_u32()
+ get_random_u8()
|
- (__be16)get_random_u32()
+ (__be16)get_random_u16()
|
- (__le16)get_random_u32()
+ (__le16)get_random_u16()
|
- prandom_u32_max(65536)
+ get_random_u16()
|
- prandom_u32_max(256)
+ get_random_u8()
|
- E->inet_id = get_random_u32()
+ E->inet_id = get_random_u16()
)
@@
identifier get_random_u32 =~ "get_random_int|prandom_u32|get_random_u32"; typedef u16;
identifier v;
@@
- u16 v = get_random_u32();
+ u16 v = get_random_u16();
@@
identifier get_random_u32 =~ "get_random_int|prandom_u32|get_random_u32"; typedef u8;
identifier v;
@@
- u8 v = get_random_u32();
+ u8 v = get_random_u8();
@@
identifier get_random_u32 =~ "get_random_int|prandom_u32|get_random_u32"; typedef u16;
u16 v;
@@
- v = get_random_u32();
+ v = get_random_u16();
@@
identifier get_random_u32 =~ "get_random_int|prandom_u32|get_random_u32"; typedef u8;
u8 v;
@@
- v = get_random_u32();
+ v = get_random_u8();
// Find a potential literal
@literal_mask@
expression LITERAL;
type T;
identifier get_random_u32 =~ "get_random_int|prandom_u32|get_random_u32"; position p;
@@
((T)get_random_u32()@p & (LITERAL))
// Examine limits
@script:python add_one@
literal << literal_mask.LITERAL;
RESULT;
@@
value = None
if literal.startswith('0x'):
value = int(literal, 16)
elif literal[0] in '123456789':
value = int(literal, 10)
if value is None:
print("I don't know how to handle %s" % (literal)) cocci.include_match(False)
elif value < 256:
coccinelle.RESULT = cocci.make_ident("get_random_u8")
elif value < 65536:
coccinelle.RESULT = cocci.make_ident("get_random_u16")
else:
print("Skipping large mask of %s" % (literal)) cocci.include_match(False)
// Replace the literal mask with the calculated result. @plus_one@
expression literal_mask.LITERAL;
position literal_mask.p;
identifier add_one.RESULT;
identifier FUNC;
@@
- (FUNC()@p & (LITERAL))
+ (RESULT() & LITERAL)
--- arch/arm/kernel/signal.c | 2 +- arch/arm64/kernel/syscall.c | 2 +- crypto/testmgr.c | 8 ++++---- drivers/media/common/v4l2-tpg/v4l2-tpg-core.c | 2 +- drivers/media/test-drivers/vivid/vivid-radio-rx.c | 4 ++-- .../net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c | 2 +- drivers/net/hamradio/baycom_epp.c | 2 +- drivers/net/hamradio/hdlcdrv.c | 2 +- drivers/net/hamradio/yam.c | 2 +- drivers/net/wireguard/selftest/allowedips.c | 4 ++-- drivers/net/wireless/st/cw1200/wsm.c | 2 +- drivers/scsi/lpfc/lpfc_hbadisc.c | 6 +++--- lib/cmdline_kunit.c | 4 ++-- net/dccp/ipv4.c | 4 ++-- net/ipv4/datagram.c | 2 +- net/ipv4/ip_output.c | 2 +- net/ipv4/tcp_ipv4.c | 4 ++-- net/mac80211/scan.c | 2 +- net/netfilter/nf_nat_core.c | 4 ++-- net/sched/sch_cake.c | 6 +++--- net/sctp/socket.c | 2 +- 21 files changed, 34 insertions(+), 34 deletions(-)
arch/arm/kernel/signal.c +1 -1
@@ -655,7 +655,7 @@ struct page *get_signal_page(void) PAGE_SIZE / sizeof(u32));/* Give the signal return code some randomness */ - offset =0x200 + (get_random_int () &0x7fc ); + offset =0x200 + (get_random_u16 () &0x7fc ); signal_return_offset = offset;/* Copy signal return handlers into the page */
arch/arm64/kernel/syscall.c +1 -1
@@ -67,7 +67,7 @@ static void invoke_syscall(struct pt_regs *regs, unsigned int scno,* * The resulting 5 bits of entropy is seen in SP[8:4]. */ -choose_random_kstack_offset (get_random_int () &0x1FF ); +choose_random_kstack_offset (get_random_u16 () &0x1FF ); }static inline bool has_syscall_work (unsigned long flags)
crypto/testmgr.c +4 -4
@@ -927,7 +927,7 @@ static void generate_random_bytes(u8 *buf, size_t count) b =0xff ;break ;default : - b = (u8 )prandom_u32 (); + b =get_random_u8 ();break ; }memset (buf, b, count);
@@ -935,8 +935,8 @@ static void generate_random_bytes(u8 *buf, size_t count)break ;case 2 :/* Ascending or descending bytes, plus optional mutations */ - increment = (u8 )prandom_u32 (); - b = (u8 )prandom_u32 (); + increment =get_random_u8 (); + b =get_random_u8 ();for (i =0 ; i < count; i++, b += increment) buf[i] = b;mutate_buffer (buf, count);
@@ -944,7 +944,7 @@ static void generate_random_bytes(u8 *buf, size_t count)default :/* Fully random bytes */ for (i =0 ; i < count; i++) - buf[i] = (u8 )prandom_u32 (); + buf[i] =get_random_u8 (); } }
drivers/media/common/v4l2-tpg/v4l2-tpg-core.c +1 -1
@@ -870,7 +870,7 @@ static void precalculate_color(struct tpg_data *tpg, int k) g = tpg_colors[col].g; b = tpg_colors[col].b; }else if (tpg->pattern ==TPG_PAT_NOISE ) { - r = g = b =prandom_u32_max (256 ); + r = g = b =get_random_u8 (); }else if (k ==TPG_COLOR_RANDOM ) { r = g = b = tpg->qual_offset +prandom_u32_max (196 ); }else if (k >=TPG_COLOR_RAMP ) {
drivers/media/test-drivers/vivid/vivid-radio-rx.c +2 -2
@@ -104,8 +104,8 @@ ssize_t vivid_radio_rx_read(struct file *file, char __user *buf,break ;case 2 : rds.block |=V4L2_RDS_BLOCK_ERROR ; - rds.lsb =prandom_u32_max (256 ); - rds.msb =prandom_u32_max (256 ); + rds.lsb =get_random_u8 (); + rds.msb =get_random_u8 ();break ;case 3 :/* Skip block altogether */ if (i)
drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c +1 -1
@@ -1466,7 +1466,7 @@ static void make_established(struct sock *sk, u32 snd_isn, unsigned int opt) tp->write_seq = snd_isn; tp->snd_nxt = snd_isn; tp->snd_una = snd_isn; -inet_sk (sk)->inet_id =prandom_u32 (); +inet_sk (sk)->inet_id =get_random_u16 ();assign_rxopt (sk, opt);if (tp->rcv_wnd > (RCV_BUFSIZ_M <<10 ))
drivers/net/hamradio/baycom_epp.c +1 -1
@@ -438,7 +438,7 @@ static int transmit(struct baycom_state *bc, int cnt, unsigned char stat)if ((--bc->hdlctx.slotcnt) >0 )return 0 ; bc->hdlctx.slotcnt = bc->ch_params.slottime; -if (prandom_u32_max (256 ) > bc->ch_params.ppersist) +if (get_random_u8 () > bc->ch_params.ppersist)return 0 ; } }
drivers/net/hamradio/hdlcdrv.c +1 -1
@@ -377,7 +377,7 @@ void hdlcdrv_arbitrate(struct net_device *dev, struct hdlcdrv_state *s)if ((--s->hdlctx.slotcnt) >0 )return ; s->hdlctx.slotcnt = s->ch_params.slottime; -if (prandom_u32_max (256 ) > s->ch_params.ppersist) +if (get_random_u8 () > s->ch_params.ppersist)return ;start_tx (dev, s); }
drivers/net/hamradio/yam.c +1 -1
@@ -626,7 +626,7 @@ static void yam_arbitrate(struct net_device *dev) yp->slotcnt = yp->slot /10 ;/* is random > persist ? */ -if (prandom_u32_max (256 ) > yp->pers) +if (get_random_u8 () > yp->pers)return ;yam_start_tx (dev, yp);
drivers/net/wireguard/selftest/allowedips.c +2 -2
@@ -310,7 +310,7 @@ static __init bool randomized_test(void)for (k =0 ; k <4 ; ++k) mutated[k] = (mutated[k] & mutate_mask[k]) | (~mutate_mask[k] & -prandom_u32_max (256 )); +get_random_u8 ()); cidr =prandom_u32_max (32 ) +1 ; peer = peers[prandom_u32_max (NUM_PEERS )]; if (wg_allowedips_insert_v4(&t,
@@ -354,7 +354,7 @@ static __init bool randomized_test(void)for (k =0 ; k <4 ; ++k) mutated[k] = (mutated[k] & mutate_mask[k]) | (~mutate_mask[k] & -prandom_u32_max (256 )); +get_random_u8 ()); cidr =prandom_u32_max (128 ) +1 ; peer = peers[prandom_u32_max (NUM_PEERS )]; if (wg_allowedips_insert_v6(&t,
drivers/net/wireless/st/cw1200/wsm.c +1 -1
@@ -1594,7 +1594,7 @@ static int cw1200_get_prio_queue(struct cw1200_common *priv, edca = &priv->edca.params[i]; score = ((edca->aifns + edca->cwmin) <<16 ) + ((edca->cwmax - edca->cwmin) * - (get_random_int () &0xFFFF )); +get_random_u16 ());if (score < best && (winner <0 || i !=3 )) { best = score; winner = i;
drivers/scsi/lpfc/lpfc_hbadisc.c +3 -3
@@ -2156,8 +2156,8 @@ lpfc_check_pending_fcoe_event(struct lpfc_hba *phba, uint8_t unreg_fcf)* This function makes an running random selection decision on FCF record to * use through a sequence of @fcf_cnt eligible FCF records with equal * probability. To perform integer manunipulation of random numbers with -* size unit32_t, the lower 16 bits of the 32-bit random number returned -* from prandom_u32() are taken as the random random number generated. +* size unit32_t, a 16-bit random number returned from get_random_u16() is +* taken as the random random number generated. * * Returns true when outcome is for the newly read FCF record should be * chosen; otherwise, return false when outcome is for keeping the previously
@@ -2169,7 +2169,7 @@ lpfc_sli4_new_fcf_random_select(struct lpfc_hba *phba, uint32_t fcf_cnt)uint32_t rand_num;/* Get 16-bit uniform random number */ - rand_num =0xFFFF &prandom_u32 (); + rand_num =get_random_u16 ();/* Decision with probability 1/fcf_cnt */ if ((fcf_cnt * rand_num) <0xFFFF )
lib/cmdline_kunit.c +2 -2
@@ -76,7 +76,7 @@ static void cmdline_test_lead_int(struct kunit *test)int rc = cmdline_test_values[i];int offset; -sprintf (in,"%u%s" ,get_random_int () %256 , str); +sprintf (in,"%u%s" ,get_random_u8 (), str);/* Only first '-' after the number will advance the pointer */ offset =strlen (in) -strlen (str) + !!(rc ==2 );cmdline_do_one_test (test, in, rc, offset);
@@ -94,7 +94,7 @@ static void cmdline_test_tail_int(struct kunit *test)int rc =strcmp (str,"" ) ? (strcmp (str,"-" ) ?0 :1 ) :1 ;int offset; -sprintf (in,"%s%u" , str,get_random_int () %256 ); +sprintf (in,"%s%u" , str,get_random_u8 ());/* * Only first and leading '-' not followed by integer * will advance the pointer.
net/dccp/ipv4.c +2 -2
@@ -144,7 +144,7 @@ int dccp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) inet->inet_daddr, inet->inet_sport, inet->inet_dport); - inet->inet_id =prandom_u32 (); + inet->inet_id =get_random_u16 (); err =dccp_connect (sk); rt =NULL ;
@@ -443,7 +443,7 @@ struct sock *dccp_v4_request_recv_sock(const struct sock *sk,RCU_INIT_POINTER (newinet->inet_opt,rcu_dereference (ireq->ireq_opt)); newinet->mc_index =inet_iif (skb); newinet->mc_ttl =ip_hdr (skb)->ttl; - newinet->inet_id =prandom_u32 (); + newinet->inet_id =get_random_u16 ();if (dst ==NULL && (dst =inet_csk_route_child_sock (sk, newsk, req)) ==NULL ) goto put_and_exit;
net/ipv4/datagram.c +1 -1
@@ -73,7 +73,7 @@ int __ip4_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_lenreuseport_has_conns (sk, true); sk->sk_state =TCP_ESTABLISHED ;sk_set_txhash (sk); - inet->inet_id =prandom_u32 (); + inet->inet_id =get_random_u16 ();sk_dst_set (sk, &rt->dst); err =0 ;
net/ipv4/ip_output.c +1 -1
@@ -172,7 +172,7 @@ int ip_build_and_send_pkt(struct sk_buff *skb, const struct sock *sk,* Avoid using the hashed IP ident generator. */ if (sk->sk_protocol ==IPPROTO_TCP ) - iph->id = (__force __be16 )prandom_u32 (); + iph->id = (__force __be16 )get_random_u16 ();else __ip_select_ident (net, iph,1 ); }
net/ipv4/tcp_ipv4.c +2 -2
@@ -323,7 +323,7 @@ int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) inet->inet_daddr); } - inet->inet_id =prandom_u32 (); + inet->inet_id =get_random_u16 ();if (tcp_fastopen_defer_connect (sk, &err))return err;
@@ -1543,7 +1543,7 @@ struct sock *tcp_v4_syn_recv_sock(const struct sock *sk, struct sk_buff *skb,inet_csk (newsk)->icsk_ext_hdr_len =0 ;if (inet_opt)inet_csk (newsk)->icsk_ext_hdr_len = inet_opt->opt.optlen; - newinet->inet_id =prandom_u32 (); + newinet->inet_id =get_random_u16 ();/* Set ToS of the new socket based upon the value of incoming SYN. * ECT bits are set later in tcp_init_transfer().
net/mac80211/scan.c +1 -1
@@ -641,7 +641,7 @@ static void ieee80211_send_scan_probe_req(struct ieee80211_sub_if_data *sdata,if (flags &IEEE80211_PROBE_FLAG_RANDOM_SN ) {struct ieee80211_hdr *hdr = (void *)skb->data;struct ieee80211_tx_info *info =IEEE80211_SKB_CB (skb); -u16 sn =get_random_u32 (); +u16 sn =get_random_u16 (); info->control.flags |=IEEE80211_TX_CTRL_NO_SEQNO ; hdr->seq_ctrl =
net/netfilter/nf_nat_core.c +2 -2
@@ -468,7 +468,7 @@ static void nf_nat_l4proto_unique_tuple(struct nf_conntrack_tuple *tuple,if (range->flags &NF_NAT_RANGE_PROTO_OFFSET ) off = (ntohs (*keyptr) -ntohs (range->base_proto.all));else - off =prandom_u32 (); + off =get_random_u16 (); attempts = range_size;if (attempts > max_attempts)
@@ -490,7 +490,7 @@ static void nf_nat_l4proto_unique_tuple(struct nf_conntrack_tuple *tuple,if (attempts >= range_size || attempts <16 )return ; attempts /=2 ; - off =prandom_u32 (); + off =get_random_u16 (); goto another_round; }
net/sched/sch_cake.c +3 -3
@@ -2092,11 +2092,11 @@ static struct sk_buff *cake_dequeue(struct Qdisc *sch)WARN_ON (host_load >CAKE_QUEUES ); -/* The shifted prandom_u32() is a way to apply dithering to -* avoid accumulating roundoff errors +/* The get_random_u16() is a way to apply dithering to avoid +* accumulating roundoff errors */ flow->deficit += (b->flow_quantum * quantum_div[host_load] + - (prandom_u32 () >>16 )) >>16 ; +get_random_u16 ()) >>16 ;list_move_tail (&flow->flowchain, &b->old_flows); goto retry;
net/sctp/socket.c +1 -1
@@ -9448,7 +9448,7 @@ void sctp_copy_sock(struct sock *newsk, struct sock *sk, newinet->inet_rcv_saddr = inet->inet_rcv_saddr; newinet->inet_dport =htons (asoc->peer.port); newinet->pmtudisc = inet->pmtudisc; - newinet->inet_id =prandom_u32 (); + newinet->inet_id =get_random_u16 (); newinet->uc_ttl = inet->uc_ttl; newinet->mc_loop =1 ;
Signature · 7 lines
2.37.3 _______________________________________________ linux-um mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-um
RE: [PATCH v6 3/7] treewide: use get_random_{u8,u16}() when possible, part 1
Quoted 2 lines
crypto/testmgr.c +0
-0
...
crypto/testmgr.c static void generate_random_bytes(u8 *buf, size_t count) · line 947
Quoted 6 lines
crypto/testmgr.c +1
-1@@ -944,7 +944,7 @@ static void generate_random_bytes(u8 *buf, size_t count)default :/* Fully random bytes */ for (i =0 ; i < count; i++) - buf[i] = (u8 )prandom_u32 (); + buf[i] =get_random_u8 ();
Should that whole for loop be replaced with this?
get_random_bytes(buf, count);
_______________________________________________
linux-um mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-um
Jason A. Donenfeld
maintainerRe: [PATCH v6 3/7] treewide: use get_random_{u8,u16}() when possible, part 1
Quoted 11 lines · Robert (Servers)
Quoted 2 lines
crypto/testmgr.c +0
-0...
crypto/testmgr.c static void generate_random_bytes(u8 *buf, size_t count) · line 947
Quoted 6 lines
crypto/testmgr.c +1
-1@@ -944,7 +944,7 @@ static void generate_random_bytes(u8 *buf, size_t count)default :/* Fully random bytes */ for (i =0 ; i < count; i++) - buf[i] = (u8 )prandom_u32 (); + buf[i] =get_random_u8 ();Should that whole for loop be replaced with this?
Quoted 1 line
get_random_bytes(buf, count);
Wow, that's kind of grotesque. Yea, it certainly should. But that's beyond the scope of this patchset. I'll send a follow-up patch just for this case to Herbert after this cleanup lands, though.
Jason
_______________________________________________
linux-um mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-um
Jason A. Donenfeld
maintainerPATCH v6 4/7 treewide: use get_random_{u8,u16}() when possible, part 2
In reply to Jason A. DonenfeldRather than truncate a 32-bit value to a 16-bit value or an 8-bit value, simply use the get_random_{u8,u16}() functions, which are faster than wasting the additional bytes from a 32-bit value. This was done by hand, identifying all of the places where one of the random integer functions was used in a non-32-bit context.
--- arch/s390/kernel/process.c | 2 +- drivers/mtd/nand/raw/nandsim.c | 2 +- lib/test_vmalloc.c | 2 +- net/rds/bind.c | 2 +- net/sched/sch_sfb.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
arch/s390/kernel/process.c +1 -1
@@ -230,7 +230,7 @@ unsigned long arch_align_stack(unsigned long sp)static inline unsigned long brk_rnd (void ) { -return (get_random_int () &BRK_RND_MASK ) <<PAGE_SHIFT ; +return (get_random_u16 () &BRK_RND_MASK ) <<PAGE_SHIFT ; }unsigned long arch_randomize_brk (struct mm_struct *mm)
drivers/mtd/nand/raw/nandsim.c +1 -1
@@ -1402,7 +1402,7 @@ static int ns_do_read_error(struct nandsim *ns, int num)static void ns_do_bit_flips (struct nandsim *ns,int num) { -if (bitflips &&prandom_u32 () < (1 <<22 )) { +if (bitflips &&get_random_u16 () < (1 <<6 )) {int flips =1 ;if (bitflips >1 ) flips =prandom_u32_max (bitflips) +1 ;
lib/test_vmalloc.c +1 -1
@@ -80,7 +80,7 @@ static int random_size_align_alloc_test(void)int i;for (i =0 ; i < test_loop_count; i++) { - rnd =prandom_u32 (); + rnd =get_random_u8 ();/* * Maximum 1024 pages, if PAGE_SIZE is 4096.
net/rds/bind.c +1 -1
@@ -104,7 +104,7 @@ static int rds_add_bound(struct rds_sock *rs, const struct in6_addr *addr,return -EINVAL ; last = rover; }else { - rover =max_t (u16,prandom_u32 (),2 ); + rover =max_t (u16,get_random_u16 (),2 ); last = rover -1 ; }
net/sched/sch_sfb.c +1 -1
@@ -379,7 +379,7 @@ static int sfb_enqueue(struct sk_buff *skb, struct Qdisc *sch, goto enqueue; } - r =prandom_u32 () &SFB_MAX_PROB ; + r =get_random_u16 () &SFB_MAX_PROB ;if (unlikely (r < p_min)) {if (unlikely (p_min >SFB_MAX_PROB /2 )) {
Signature · 7 lines
2.37.3 _______________________________________________ linux-um mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-um
Re: [PATCH v6 4/7] treewide: use get_random_{u8,u16}() when possible, part 2
Quoted 6 lines · Jason A. Donenfeld
Rather than truncate a 32-bit value to a 16-bit value or an 8-bit value, simply use the get_random_{u8,u16}() functions, which are faster than wasting the additional bytes from a 32-bit value. This was done by hand, identifying all of the places where one of the random integer functions was used in a non-32-bit context.
Quoted 6 lines
Reviewed-by Greg Kroah-Hartman <[email protected]>Reviewed-by Kees Cook <[email protected]>Reviewed-by Yury Norov <[email protected]>Signed-off-by Jason A. Donenfeld <[email protected]>--- arch/s390/kernel/process.c | 2 +-
For s390:
_______________________________________________
linux-um mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-um
Jason A. Donenfeld
maintainerPATCH v6 5/7 treewide: use get_random_u32() when possible
In reply to Jason A. DonenfeldThe 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.
--- Documentation/networking/filter.rst | 2 +- arch/parisc/kernel/process.c | 2 +- arch/parisc/kernel/sys_parisc.c | 4 ++-- arch/s390/mm/mmap.c | 2 +- arch/x86/kernel/cpu/amd.c | 2 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 6 +++--- drivers/gpu/drm/i915/selftests/i915_selftest.c | 2 +- drivers/gpu/drm/tests/drm_buddy_test.c | 2 +- drivers/gpu/drm/tests/drm_mm_test.c | 2 +- drivers/infiniband/hw/cxgb4/cm.c | 4 ++-- drivers/infiniband/hw/hfi1/tid_rdma.c | 2 +- drivers/infiniband/hw/mlx4/mad.c | 2 +- drivers/infiniband/ulp/ipoib/ipoib_cm.c | 2 +- drivers/md/raid5-cache.c | 2 +- .../media/test-drivers/vivid/vivid-touch-cap.c | 4 ++-- drivers/misc/habanalabs/gaudi2/gaudi2.c | 2 +- drivers/net/bonding/bond_main.c | 2 +- drivers/net/ethernet/broadcom/cnic.c | 2 +- .../chelsio/inline_crypto/chtls/chtls_cm.c | 2 +- drivers/net/ethernet/rocker/rocker_main.c | 6 +++--- .../wireless/broadcom/brcm80211/brcmfmac/pno.c | 2 +- .../net/wireless/marvell/mwifiex/cfg80211.c | 4 ++-- .../net/wireless/microchip/wilc1000/cfg80211.c | 2 +- .../net/wireless/quantenna/qtnfmac/cfg80211.c | 2 +- drivers/net/wireless/ti/wlcore/main.c | 2 +- drivers/nvme/common/auth.c | 2 +- drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 4 ++-- drivers/target/iscsi/cxgbit/cxgbit_cm.c | 2 +- drivers/thunderbolt/xdomain.c | 2 +- drivers/video/fbdev/uvesafb.c | 2 +- fs/exfat/inode.c | 2 +- fs/ext4/ialloc.c | 2 +- fs/ext4/ioctl.c | 4 ++-- fs/ext4/mmp.c | 2 +- fs/f2fs/namei.c | 2 +- fs/fat/inode.c | 2 +- fs/nfsd/nfs4state.c | 4 ++-- fs/ntfs3/fslog.c | 6 +++--- fs/ubifs/journal.c | 2 +- fs/xfs/libxfs/xfs_ialloc.c | 2 +- fs/xfs/xfs_icache.c | 2 +- fs/xfs/xfs_log.c | 2 +- include/net/netfilter/nf_queue.h | 2 +- include/net/red.h | 2 +- include/net/sock.h | 2 +- kernel/bpf/bloom_filter.c | 2 +- kernel/bpf/core.c | 2 +- kernel/bpf/hashtab.c | 2 +- kernel/bpf/verifier.c | 2 +- kernel/kcsan/selftest.c | 2 +- lib/random32.c | 2 +- lib/reed_solomon/test_rslib.c | 6 +++--- lib/test_fprobe.c | 2 +- lib/test_kprobes.c | 2 +- lib/test_min_heap.c | 6 +++--- lib/test_rhashtable.c | 6 +++--- mm/shmem.c | 2 +- mm/slab.c | 2 +- net/core/pktgen.c | 4 ++-- net/ipv4/route.c | 2 +- net/ipv4/tcp_cdg.c | 2 +- net/ipv4/udp.c | 2 +- net/ipv6/ip6_flowlabel.c | 2 +- net/ipv6/output_core.c | 2 +- net/netfilter/ipvs/ip_vs_conn.c | 2 +- net/netfilter/xt_statistic.c | 2 +- net/openvswitch/actions.c | 2 +- net/sched/sch_cake.c | 2 +- net/sched/sch_netem.c | 18 +++++++++--------- net/sunrpc/auth_gss/gss_krb5_wrap.c | 4 ++-- net/sunrpc/xprt.c | 2 +- net/unix/af_unix.c | 2 +- 72 files changed, 101 insertions(+), 101 deletions(-)
Documentation/networking/filter.rst +1 -1
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 ))
drivers/gpu/drm/i915/i915_gem_gtt.c +3 -3
@@ -137,12 +137,12 @@ static u64 random_offset(u64 start, u64 end, u64 len, u64 align) range =round_down (end - len, align) -round_up (start, align);if (range) {if (sizeof (unsigned long ) ==sizeof (u64)) { - addr =get_random_long (); + addr =get_random_u64 (); }else { - addr =get_random_int (); + addr =get_random_u32 ();if (range >U32_MAX ) { addr <<=32 ; - addr |=get_random_int (); + addr |=get_random_u32 (); } }div64_u64_rem (addr, range, &addr);
drivers/gpu/drm/i915/selftests/i915_selftest.c +1 -1
@@ -135,7 +135,7 @@ static int __run_selftests(const char *name,int err =0 ;while (!i915_selftest.random_seed) - i915_selftest.random_seed =get_random_int (); + i915_selftest.random_seed =get_random_u32 (); i915_selftest.timeout_jiffies = i915_selftest.timeout_ms ?
drivers/gpu/drm/tests/drm_buddy_test.c +1 -1
@@ -729,7 +729,7 @@ static void drm_test_buddy_alloc_limit(struct kunit *test)static int drm_buddy_init_test (struct kunit *test) {while (!random_seed) - random_seed =get_random_int (); + random_seed =get_random_u32 ();return 0 ; }
drivers/gpu/drm/tests/drm_mm_test.c +1 -1
@@ -2212,7 +2212,7 @@ static void drm_test_mm_color_evict_range(struct kunit *test)static int drm_mm_init_test (struct kunit *test) {while (!random_seed) - random_seed =get_random_int (); + random_seed =get_random_u32 ();return 0 ; }
drivers/infiniband/hw/cxgb4/cm.c +2 -2
@@ -734,7 +734,7 @@ static int send_connect(struct c4iw_ep *ep) &ep->com.remote_addr;int ret;enum chip_type adapter_type = ep->com.dev->rdev.lldi.adapter_type; -u32 isn = (prandom_u32 () & ~7UL ) -1 ; +u32 isn = (get_random_u32 () & ~7UL ) -1 ;struct net_device *netdev;u64 params;
@@ -2469,7 +2469,7 @@ static int accept_cr(struct c4iw_ep *ep, struct sk_buff *skb, }if (!is_t4 (adapter_type)) { -u32 isn = (prandom_u32 () & ~7UL ) -1 ; +u32 isn = (get_random_u32 () & ~7UL ) -1 ; skb =get_skb (skb,roundup (sizeof (*rpl5),16 ),GFP_KERNEL ); rpl5 =__skb_put_zero (skb,roundup (sizeof (*rpl5),16 ));
drivers/infiniband/hw/hfi1/tid_rdma.c +1 -1
@@ -850,7 +850,7 @@ void hfi1_kern_init_ctxt_generations(struct hfi1_ctxtdata *rcd)int i;for (i =0 ; i <RXE_NUM_TID_FLOWS ; i++) { - rcd->flows[i].generation =mask_generation (prandom_u32 ()); + rcd->flows[i].generation =mask_generation (get_random_u32 ());kern_set_hw_flow (rcd,KERN_GENERATION_RESERVED , i); } }
drivers/infiniband/hw/mlx4/mad.c +1 -1
@@ -96,7 +96,7 @@ static void __propagate_pkey_ev(struct mlx4_ib_dev *dev, int port_num,__be64 mlx4_ib_gen_node_guid (void ) {#define NODE_GUID_HI ((u64) (((u64)IB_OPENIB_OUI) << 40)) -return cpu_to_be64 (NODE_GUID_HI |prandom_u32 ()); +return cpu_to_be64 (NODE_GUID_HI |get_random_u32 ()); }__be64 mlx4_ib_get_new_demux_tid (struct mlx4_ib_demux_ctx *ctx)
drivers/infiniband/ulp/ipoib/ipoib_cm.c +1 -1
@@ -465,7 +465,7 @@ static int ipoib_cm_req_handler(struct ib_cm_id *cm_id, goto err_qp; } - psn =prandom_u32 () &0xffffff ; + psn =get_random_u32 () &0xffffff ; ret =ipoib_cm_modify_rx_qp (dev, cm_id, p->qp, psn);if (ret) goto err_modify;
drivers/md/raid5-cache.c +1 -1
@@ -2994,7 +2994,7 @@ static int r5l_load_log(struct r5l_log *log) } create:if (create_super) { - log->last_cp_seq =prandom_u32 (); + log->last_cp_seq =get_random_u32 (); cp =0 ;r5l_log_write_empty_meta_block (log, cp, log->last_cp_seq);/*
drivers/media/test-drivers/vivid/vivid-touch-cap.c +2 -2
@@ -210,7 +210,7 @@ static void vivid_fill_buff_noise(__s16 *tch_buf, int size)/* Fill 10% of the values within range -3 and 3, zero the others */ for (i =0 ; i < size; i++) { -unsigned int rand =get_random_int (); +unsigned int rand =get_random_u32 ();if (rand %10 ) tch_buf[i] =0 ;
@@ -272,7 +272,7 @@ void vivid_fillbuff_tch(struct vivid_dev *dev, struct vivid_buffer *buf)return ;if (test_pat_idx ==0 ) - dev->tch_pat_random =get_random_int (); + dev->tch_pat_random =get_random_u32 (); rand = dev->tch_pat_random;switch (test_pattern) {
drivers/misc/habanalabs/gaudi2/gaudi2.c +1 -1
@@ -2948,7 +2948,7 @@ static void gaudi2_user_interrupt_setup(struct hl_device *hdev)static inline int gaudi2_get_non_zero_random_int (void ) { -int rand =get_random_int (); +int rand =get_random_u32 ();return rand ? rand :1 ; }
drivers/net/bonding/bond_main.c +1 -1
@@ -4806,7 +4806,7 @@ static u32 bond_rr_gen_slave_id(struct bonding *bond)switch (packets_per_slave) {case 0 : - slave_id =prandom_u32 (); + slave_id =get_random_u32 ();break ;case 1 : slave_id =this_cpu_inc_return (*bond->rr_tx_counter);
drivers/net/ethernet/broadcom/cnic.c +1 -1
@@ -4164,7 +4164,7 @@ static int cnic_cm_init_bnx2_hw(struct cnic_dev *dev) {u32 seed; - seed =prandom_u32 (); + seed =get_random_u32 ();cnic_ctx_wr (dev,45 ,0 , seed);return 0 ; }
drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c +1 -1
@@ -1063,7 +1063,7 @@ static void chtls_pass_accept_rpl(struct sk_buff *skb, opt2 |=WND_SCALE_EN_V (WSCALE_OK (tp)); rpl5->opt0 =cpu_to_be64 (opt0); rpl5->opt2 =cpu_to_be32 (opt2); - rpl5->iss =cpu_to_be32 ((prandom_u32 () & ~7UL ) -1 ); + rpl5->iss =cpu_to_be32 ((get_random_u32 () & ~7UL ) -1 );set_wr_txq (skb,CPL_PRIORITY_SETUP , csk->port_id);t4_set_arp_err_handler (skb, sk, chtls_accept_rpl_arp_failure);cxgb4_l2t_send (csk->egress_dev, skb, csk->l2t_entry);
drivers/net/ethernet/rocker/rocker_main.c +3 -3
@@ -129,7 +129,7 @@ static int rocker_reg_test(const struct rocker *rocker)u64 test_reg;u64 rnd; - rnd =prandom_u32 (); + rnd =get_random_u32 (); rnd >>=1 ;rocker_write32 (rocker,TEST_REG , rnd); test_reg =rocker_read32 (rocker,TEST_REG );
@@ -139,9 +139,9 @@ static int rocker_reg_test(const struct rocker *rocker)return -EIO ; } - rnd =prandom_u32 (); + rnd =get_random_u32 (); rnd <<=31 ; - rnd |=prandom_u32 (); + rnd |=get_random_u32 ();rocker_write64 (rocker,TEST_REG64 , rnd); test_reg =rocker_read64 (rocker,TEST_REG64 );if (test_reg != rnd *2 ) {
drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c +1 -1
@@ -177,7 +177,7 @@ static int brcmf_pno_set_random(struct brcmf_if *ifp, struct brcmf_pno_info *pi)memcpy (pfn_mac.mac, mac_addr,ETH_ALEN );for (i =0 ; i <ETH_ALEN ; i++) { pfn_mac.mac[i] &= mac_mask[i]; - pfn_mac.mac[i] |=get_random_int () & ~(mac_mask[i]); + pfn_mac.mac[i] |=get_random_u32 () & ~(mac_mask[i]); }/* Clear multi bit */ pfn_mac.mac[0 ] &=0xFE ;
drivers/net/wireless/marvell/mwifiex/cfg80211.c +2 -2
@@ -239,7 +239,7 @@ mwifiex_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, tx_info->pkt_len = pkt_len;mwifiex_form_mgmt_frame (skb, buf, len); - *cookie =prandom_u32 () |1 ; + *cookie =get_random_u32 () |1 ;if (ieee80211_is_action (mgmt->frame_control)) skb = mwifiex_clone_skb_for_tx_status(priv,
@@ -303,7 +303,7 @@ mwifiex_cfg80211_remain_on_channel(struct wiphy *wiphy, duration);if (!ret) { - *cookie =prandom_u32 () |1 ; + *cookie =get_random_u32 () |1 ; priv->roc_cfg.cookie = *cookie; priv->roc_cfg.chan = *chan;
drivers/net/wireless/microchip/wilc1000/cfg80211.c +1 -1
@@ -1161,7 +1161,7 @@ static int mgmt_tx(struct wiphy *wiphy,const u8 *vendor_ie;int ret =0 ; - *cookie =prandom_u32 (); + *cookie =get_random_u32 (); priv->tx_cookie = *cookie; mgmt = (const struct ieee80211_mgmt *)buf;
drivers/net/wireless/quantenna/qtnfmac/cfg80211.c +1 -1
@@ -449,7 +449,7 @@ qtnf_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, {struct qtnf_vif *vif =qtnf_netdev_get_priv (wdev->netdev);const struct ieee80211_mgmt *mgmt_frame = (void *)params->buf; -u32 short_cookie =prandom_u32 (); +u32 short_cookie =get_random_u32 ();u16 flags =0 ;u16 freq;
drivers/net/wireless/ti/wlcore/main.c +1 -1
@@ -6100,7 +6100,7 @@ static int wl1271_register_hw(struct wl1271 *wl)wl1271_warning ("Fuse mac address is zero. using random mac" );/* Use TI oui and a random nic */ oui_addr =WLCORE_TI_OUI_ADDRESS ; - nic_addr =get_random_int (); + nic_addr =get_random_u32 (); }else { oui_addr = wl->fuse_oui_addr;/* fuse has the BD_ADDR, the WLAN addresses are the next two */
drivers/nvme/common/auth.c +1 -1
@@ -23,7 +23,7 @@ u32 nvme_auth_get_seqnum(void)mutex_lock (&nvme_dhchap_mutex);if (!nvme_dhchap_seqnum) - nvme_dhchap_seqnum =prandom_u32 (); + nvme_dhchap_seqnum =get_random_u32 ();else { nvme_dhchap_seqnum++;if (!nvme_dhchap_seqnum)
drivers/scsi/cxgbi/cxgb4i/cxgb4i.c +2 -2
@@ -254,7 +254,7 @@ static void send_act_open_req(struct cxgbi_sock *csk, struct sk_buff *skb, }else if (is_t5 (lldi->adapter_type)) {struct cpl_t5_act_open_req *req = (struct cpl_t5_act_open_req *)skb->head; -u32 isn = (prandom_u32 () & ~7UL ) -1 ; +u32 isn = (get_random_u32 () & ~7UL ) -1 ;INIT_TP_WR (req,0 ); OPCODE_TID(req) = cpu_to_be32(MK_OPCODE_TID(CPL_ACT_OPEN_REQ,
@@ -282,7 +282,7 @@ static void send_act_open_req(struct cxgbi_sock *csk, struct sk_buff *skb, }else {struct cpl_t6_act_open_req *req = (struct cpl_t6_act_open_req *)skb->head; -u32 isn = (prandom_u32 () & ~7UL ) -1 ; +u32 isn = (get_random_u32 () & ~7UL ) -1 ;INIT_TP_WR (req,0 ); OPCODE_TID(req) = cpu_to_be32(MK_OPCODE_TID(CPL_ACT_OPEN_REQ,
drivers/target/iscsi/cxgbit/cxgbit_cm.c +1 -1
@@ -1202,7 +1202,7 @@ cxgbit_pass_accept_rpl(struct cxgbit_sock *csk, struct cpl_pass_accept_req *req) opt2 |=CONG_CNTRL_V (CONG_ALG_NEWRENO ); opt2 |=T5_ISS_F ; - rpl5->iss =cpu_to_be32 ((prandom_u32 () & ~7UL ) -1 ); + rpl5->iss =cpu_to_be32 ((get_random_u32 () & ~7UL ) -1 ); opt2 |=T5_OPT_2_VALID_F ;
drivers/thunderbolt/xdomain.c +1 -1
@@ -2437,7 +2437,7 @@ int tb_xdomain_init(void)tb_property_add_immediate (xdomain_property_dir,"deviceid" ,0x1 );tb_property_add_immediate (xdomain_property_dir,"devicerv" ,0x80000100 ); - xdomain_property_block_gen =prandom_u32 (); + xdomain_property_block_gen =get_random_u32 ();return 0 ; }
drivers/video/fbdev/uvesafb.c +1 -1
@@ -167,7 +167,7 @@ static int uvesafb_exec(struct uvesafb_ktask *task)memcpy (&m->id, &uvesafb_cn_id,sizeof (m->id)); m->seq = seq; m->len = len; - m->ack =prandom_u32 (); + m->ack =get_random_u32 ();/* uvesafb_task structure */ memcpy (m +1 , &task->t,sizeof (task->t));
fs/exfat/inode.c +1 -1
@@ -552,7 +552,7 @@ static int exfat_fill_inode(struct inode *inode, struct exfat_dir_entry *info) inode->i_uid = sbi->options.fs_uid; inode->i_gid = sbi->options.fs_gid;inode_inc_iversion (inode); - inode->i_generation =prandom_u32 (); + inode->i_generation =get_random_u32 ();if (info->attr &ATTR_SUBDIR ) {/* directory */ inode->i_generation &= ~1 ;
fs/ext4/ialloc.c +1 -1
@@ -1279,7 +1279,7 @@ struct inode *__ext4_new_inode(struct user_namespace *mnt_userns, EXT4_GROUP_INFO_IBITMAP_CORRUPT); goto out; } - inode->i_generation =prandom_u32 (); + inode->i_generation =get_random_u32 ();/* Precompute checksum seed for inode metadata */ if (ext4_has_metadata_csum (sb)) {
fs/ext4/ioctl.c +2 -2
@@ -454,8 +454,8 @@ static long swap_inode_boot_loader(struct super_block *sb, inode->i_ctime = inode_bl->i_ctime =current_time (inode);inode_inc_iversion (inode); - inode->i_generation =prandom_u32 (); - inode_bl->i_generation =prandom_u32 (); + inode->i_generation =get_random_u32 (); + inode_bl->i_generation =get_random_u32 ();ext4_reset_inode_seed (inode);ext4_reset_inode_seed (inode_bl);
fs/ext4/mmp.c +1 -1
@@ -265,7 +265,7 @@ static unsigned int mmp_new_seq(void)u32 new_seq;do { - new_seq =prandom_u32 (); + new_seq =get_random_u32 (); }while (new_seq >EXT4_MMP_SEQ_MAX );return new_seq;
fs/f2fs/namei.c +1 -1
@@ -50,7 +50,7 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns, inode->i_blocks =0 ; inode->i_mtime = inode->i_atime = inode->i_ctime =current_time (inode);F2FS_I (inode)->i_crtime = inode->i_mtime; - inode->i_generation =prandom_u32 (); + inode->i_generation =get_random_u32 ();if (S_ISDIR (inode->i_mode))F2FS_I (inode)->i_current_depth =1 ;
fs/fat/inode.c +1 -1
@@ -523,7 +523,7 @@ int fat_fill_inode(struct inode *inode, struct msdos_dir_entry *de) inode->i_uid = sbi->options.fs_uid; inode->i_gid = sbi->options.fs_gid;inode_inc_iversion (inode); - inode->i_generation =prandom_u32 (); + inode->i_generation =get_random_u32 ();if ((de->attr &ATTR_DIR ) && !IS_FREE (de->name)) { inode->i_generation &= ~1 ;
fs/nfsd/nfs4state.c +2 -2
@@ -4375,8 +4375,8 @@ nfsd4_init_leases_net(struct nfsd_net *nn) nn->nfsd4_grace =90 ; nn->somebody_reclaimed = false; nn->track_reclaim_completes = false; - nn->clverifier_counter =prandom_u32 (); - nn->clientid_base =prandom_u32 (); + nn->clverifier_counter =get_random_u32 (); + nn->clientid_base =get_random_u32 (); nn->clientid_counter = nn->clientid_base +1 ; nn->s2s_cp_cl_id = nn->clientid_counter++;
fs/ntfs3/fslog.c +3 -3
@@ -3819,7 +3819,7 @@ int log_replay(struct ntfs_inode *ni, bool *initialized) }log_init_pg_hdr (log, page_size, page_size,1 ,1 ); -log_create (log, l_size,0 ,get_random_int (), false, false); +log_create (log, l_size,0 ,get_random_u32 (), false, false); log->ra = ra;
@@ -3893,7 +3893,7 @@ int log_replay(struct ntfs_inode *ni, bool *initialized)/* Do some checks based on whether we have a valid log page. */ if (!rst_info.valid_page) { - open_log_count =get_random_int (); + open_log_count =get_random_u32 (); goto init_log_instance; } open_log_count =le32_to_cpu (ra2->open_log_count);
@@ -4044,7 +4044,7 @@ int log_replay(struct ntfs_inode *ni, bool *initialized)memcpy (ra->clients,Add2Ptr (ra2, t16),le16_to_cpu (ra2->ra_len) - t16); - log->current_openlog_count =get_random_int (); + log->current_openlog_count =get_random_u32 (); ra->open_log_count =cpu_to_le32 (log->current_openlog_count); log->ra_size = offsetof(struct RESTART_AREA , clients) +sizeof (struct CLIENT_REC );
fs/ubifs/journal.c +1 -1
@@ -503,7 +503,7 @@ static void mark_inode_clean(struct ubifs_info *c, struct ubifs_inode *ui)static void set_dent_cookie (struct ubifs_info *c,struct ubifs_dent_node *dent) {if (c->double_hash) - dent->cookie = (__force __le32 )prandom_u32 (); + dent->cookie = (__force __le32 )get_random_u32 ();else dent->cookie =0 ; }
fs/xfs/libxfs/xfs_ialloc.c +1 -1
@@ -805,7 +805,7 @@ xfs_ialloc_ag_alloc(* number from being easily guessable. */ error =xfs_ialloc_inode_init (args.mp, tp,NULL , newlen, pag->pag_agno, - args.agbno, args.len,prandom_u32 ()); + args.agbno, args.len,get_random_u32 ());if (error)return error;
fs/xfs/xfs_icache.c +1 -1
@@ -596,7 +596,7 @@ xfs_iget_cache_miss(*/ if (xfs_has_v3inodes (mp) && (flags &XFS_IGET_CREATE ) && !xfs_has_ikeep (mp)) { -VFS_I (ip)->i_generation =prandom_u32 (); +VFS_I (ip)->i_generation =get_random_u32 (); }else {struct xfs_buf *bp;
fs/xfs/xfs_log.c +1 -1
@@ -3544,7 +3544,7 @@ xlog_ticket_alloc( tic->t_curr_res = unit_res; tic->t_cnt = cnt; tic->t_ocnt = cnt; - tic->t_tid =prandom_u32 (); + tic->t_tid =get_random_u32 ();if (permanent) tic->t_flags |=XLOG_TIC_PERM_RESERV ;
include/net/netfilter/nf_queue.h +1 -1
@@ -43,7 +43,7 @@ void nf_queue_entry_free(struct nf_queue_entry *entry);static inline void init_hashrandom (u32 *jhash_initval) {while (*jhash_initval ==0 ) - *jhash_initval =prandom_u32 (); + *jhash_initval =get_random_u32 (); }static inline u32 hash_v4 (const struct iphdr *iph,u32 initval)
include/net/red.h +1 -1
@@ -363,7 +363,7 @@ static inline unsigned long red_calc_qavg(const struct red_parms *p,static inline u32 red_random (const struct red_parms *p) { -return reciprocal_divide (prandom_u32 (), p->max_P_reciprocal); +return reciprocal_divide (get_random_u32 (), p->max_P_reciprocal); } static inline int red_mark_probability(const struct red_parms *p,
include/net/sock.h +1 -1
@@ -2109,7 +2109,7 @@ static inline kuid_t sock_net_uid(const struct net *net, const struct sock *sk)static inline u32 net_tx_rndhash (void ) { -u32 v =prandom_u32 (); +u32 v =get_random_u32 ();return v ?:1 ; }
kernel/bpf/bloom_filter.c +1 -1
@@ -158,7 +158,7 @@ static struct bpf_map *bloom_map_alloc(union bpf_attr *attr) attr->value_size /sizeof (u32);if (!(attr->map_flags &BPF_F_ZERO_SEED )) - bloom->hash_seed =get_random_int (); + bloom->hash_seed =get_random_u32 ();return &bloom->map; }
kernel/bpf/core.c +1 -1
@@ -1216,7 +1216,7 @@ static int bpf_jit_blind_insn(const struct bpf_insn *from, bool emit_zext) {struct bpf_insn *to = to_buff; -u32 imm_rnd =get_random_int (); +u32 imm_rnd =get_random_u32 ();s16 off;BUILD_BUG_ON (BPF_REG_AX +1 !=MAX_BPF_JIT_REG );
kernel/bpf/hashtab.c +1 -1
@@ -527,7 +527,7 @@ static struct bpf_map *htab_map_alloc(union bpf_attr *attr)if (htab->map.map_flags &BPF_F_ZERO_SEED ) htab->hashrnd =0 ;else - htab->hashrnd =get_random_int (); + htab->hashrnd =get_random_u32 ();htab_init_buckets (htab);
kernel/bpf/verifier.c +1 -1
@@ -13350,7 +13350,7 @@ static int opt_subreg_zext_lo32_rnd_hi32(struct bpf_verifier_env *env, aux[adj_idx].ptr_type == PTR_TO_CTX)continue ; - imm_rnd =get_random_int (); + imm_rnd =get_random_u32 (); rnd_hi32_patch[0 ] = insn; rnd_hi32_patch[1 ].imm = imm_rnd; rnd_hi32_patch[3 ].dst_reg = load_reg;
kernel/kcsan/selftest.c +1 -1
@@ -26,7 +26,7 @@static bool __init test_requires (void ) {/* random should be initialized for the below tests */ -return prandom_u32 () +prandom_u32 () !=0 ; +return get_random_u32 () +get_random_u32 () !=0 ; }/*
lib/random32.c +1 -1
@@ -47,7 +47,7 @@* @state: pointer to state structure holding seeded state. * * This is used for pseudo-randomness with no outside seeding. -* For more random results, use prandom_u32(). +* For more random results, use get_random_u32(). */ u32 prandom_u32_state (struct rnd_state *state) {
lib/reed_solomon/test_rslib.c +3 -3
@@ -164,7 +164,7 @@ static int get_rcw_we(struct rs_control *rs, struct wspace *ws,/* Load c with random data and encode */ for (i =0 ; i < dlen; i++) - c[i] =prandom_u32 () & nn; + c[i] =get_random_u32 () & nn;memset (c + dlen,0 , nroots *sizeof (*c));encode_rs16 (rs, c, dlen, c + dlen,0 );
@@ -178,7 +178,7 @@ static int get_rcw_we(struct rs_control *rs, struct wspace *ws,for (i =0 ; i < errs; i++) {do {/* Error value must be nonzero */ - errval =prandom_u32 () & nn; + errval =get_random_u32 () & nn; }while (errval ==0 ); do {
@@ -206,7 +206,7 @@ static int get_rcw_we(struct rs_control *rs, struct wspace *ws,/* Erasure with corrupted symbol */ do {/* Error value must be nonzero */ - errval =prandom_u32 () & nn; + errval =get_random_u32 () & nn; }while (errval ==0 ); errlocs[errloc] =1 ;
lib/test_fprobe.c +1 -1
@@ -145,7 +145,7 @@ static unsigned long get_ftrace_location(void *func)static int fprobe_test_init (struct kunit *test) {do { - rand1 =prandom_u32 (); + rand1 =get_random_u32 (); }while (rand1 <= div_factor); target = fprobe_selftest_target;
lib/test_kprobes.c +1 -1
@@ -341,7 +341,7 @@ static int kprobes_test_init(struct kunit *test) stacktrace_driver = kprobe_stacktrace_driver;do { - rand1 =prandom_u32 (); + rand1 =get_random_u32 (); }while (rand1 <= div_factor);return 0 ; }
lib/test_min_heap.c +3 -3
@@ -83,7 +83,7 @@ static __init int test_heapify_all(bool min_heap)/* Test with randomly generated values. */ heap.nr =ARRAY_SIZE (values);for (i =0 ; i < heap.nr; i++) - values[i] =get_random_int (); + values[i] =get_random_u32 ();min_heapify_all (&heap, &funcs); err +=pop_verify_heap (min_heap, &heap, &funcs);
@@ -116,7 +116,7 @@ static __init int test_heap_push(bool min_heap)/* Test with randomly generated values. */ while (heap.nr < heap.size) { - temp =get_random_int (); + temp =get_random_u32 ();min_heap_push (&heap, &temp, &funcs); } err +=pop_verify_heap (min_heap, &heap, &funcs);
@@ -158,7 +158,7 @@ static __init int test_heap_pop_push(bool min_heap)/* Test with randomly generated values. */ for (i =0 ; i <ARRAY_SIZE (data); i++) { - temp =get_random_int (); + temp =get_random_u32 ();min_heap_pop_push (&heap, &temp, &funcs); } err +=pop_verify_heap (min_heap, &heap, &funcs);
lib/test_rhashtable.c +3 -3
@@ -291,7 +291,7 @@ static int __init test_rhltable(unsigned int entries)if (WARN_ON (err)) goto out_free; - k =prandom_u32 (); + k =get_random_u32 (); ret =0 ;for (i =0 ; i < entries; i++) { rhl_test_objects[i].value.id = k;
@@ -369,12 +369,12 @@ static int __init test_rhltable(unsigned int entries)pr_info ("test %d random rhlist add/delete operations\n" , entries);for (j =0 ; j < entries; j++) {u32 i =prandom_u32_max (entries); -u32 prand =prandom_u32 (); +u32 prand =get_random_u32 ();cond_resched ();if (prand ==0 ) - prand =prandom_u32 (); + prand =get_random_u32 ();if (prand &1 ) { prand >>=1 ;
mm/shmem.c +1 -1
@@ -2330,7 +2330,7 @@ static struct inode *shmem_get_inode(struct super_block *sb, struct inode *dir,inode_init_owner (&init_user_ns, inode, dir, mode); inode->i_blocks =0 ; inode->i_atime = inode->i_mtime = inode->i_ctime =current_time (inode); - inode->i_generation =prandom_u32 (); + inode->i_generation =get_random_u32 (); info =SHMEM_I (inode);memset (info,0 , (char *)inode - (char *)info);spin_lock_init (&info->lock);
mm/slab.c +1 -1
@@ -2380,7 +2380,7 @@ static bool freelist_state_initialize(union freelist_init_state *state,unsigned int rand;/* Use best entropy available to define a random shift */ - rand =get_random_int (); + rand =get_random_u32 ();/* Use a random state if the pre-computed list is not available */ if (!cachep->random_seq) {
net/core/pktgen.c +2 -2
@@ -2464,7 +2464,7 @@ static void mod_cur_headers(struct pktgen_dev *pkt_dev)for (i =0 ; i < pkt_dev->nr_labels; i++)if (pkt_dev->labels[i] &MPLS_STACK_BOTTOM ) pkt_dev->labels[i] =MPLS_STACK_BOTTOM | - ((__force __be32 )prandom_u32 () & + ((__force __be32 )get_random_u32 () &htonl (0x000fffff )); }
@@ -2568,7 +2568,7 @@ static void mod_cur_headers(struct pktgen_dev *pkt_dev)for (i =0 ; i <4 ; i++) { pkt_dev->cur_in6_daddr.s6_addr32[i] = - (((__force __be32 )prandom_u32 () | + (((__force __be32 )get_random_u32 () | pkt_dev->min_in6_daddr.s6_addr32[i]) & pkt_dev->max_in6_daddr.s6_addr32[i]); }
net/ipv4/route.c +1 -1
@@ -3664,7 +3664,7 @@ static __net_init int rt_genid_init(struct net *net) {atomic_set (&net->ipv4.rt_genid,0 );atomic_set (&net->fnhe_genid,0 ); -atomic_set (&net->ipv4.dev_addr_genid,get_random_int ()); +atomic_set (&net->ipv4.dev_addr_genid,get_random_u32 ());return 0 ; }
net/ipv4/tcp_cdg.c +1 -1
@@ -243,7 +243,7 @@ static bool tcp_cdg_backoff(struct sock *sk, u32 grad)struct cdg *ca =inet_csk_ca (sk);struct tcp_sock *tp =tcp_sk (sk); -if (prandom_u32 () <=nexp_u32 (grad * backoff_factor)) +if (get_random_u32 () <=nexp_u32 (grad * backoff_factor))return false;if (use_ineff) {
net/ipv4/udp.c +1 -1
@@ -246,7 +246,7 @@ int udp_lib_get_port(struct sock *sk, unsigned short snum,inet_get_local_port_range (net, &low, &high); remaining = (high - low) +1 ; - rand =prandom_u32 (); + rand =get_random_u32 (); first =reciprocal_scale (rand, remaining) + low;/* * force rand to be an odd multiple of UDP_HTABLE_SIZE
net/ipv6/ip6_flowlabel.c +1 -1
@@ -220,7 +220,7 @@ static struct ip6_flowlabel *fl_intern(struct net *net,spin_lock_bh (&ip6_fl_lock);if (label ==0 ) {for (;;) { - fl->label =htonl (prandom_u32 ())&IPV6_FLOWLABEL_MASK ; + fl->label =htonl (get_random_u32 ())&IPV6_FLOWLABEL_MASK ;if (fl->label) { lfl =__fl_lookup (net, fl->label);if (!lfl)
net/ipv6/output_core.c +1 -1
@@ -18,7 +18,7 @@ static u32 __ipv6_select_ident(struct net *net,u32 id;do { - id =prandom_u32 (); + id =get_random_u32 (); }while (!id);return id;
net/netfilter/ipvs/ip_vs_conn.c +1 -1
@@ -1308,7 +1308,7 @@ void ip_vs_random_dropentry(struct netns_ipvs *ipvs)* Randomly scan 1/32 of the whole table every second */ for (idx =0 ; idx < (ip_vs_conn_tab_size>>5 ); idx++) { -unsigned int hash =prandom_u32 () & ip_vs_conn_tab_mask; +unsigned int hash =get_random_u32 () & ip_vs_conn_tab_mask;hlist_for_each_entry_rcu (cp, &ip_vs_conn_tab[hash], c_list) {if (cp->ipvs != ipvs)
net/netfilter/xt_statistic.c +1 -1
@@ -34,7 +34,7 @@ statistic_mt(const struct sk_buff *skb, struct xt_action_param *par)switch (info->mode) {case XT_STATISTIC_MODE_RANDOM : -if ((prandom_u32 () &0x7FFFFFFF ) < info->u.random.probability) +if ((get_random_u32 () &0x7FFFFFFF ) < info->u.random.probability) ret = !ret;break ;case XT_STATISTIC_MODE_NTH :
net/openvswitch/actions.c +1 -1
@@ -1033,7 +1033,7 @@ static int sample(struct datapath *dp, struct sk_buff *skb, actions =nla_next (sample_arg, &rem);if ((arg->probability !=U32_MAX ) && - (!arg->probability ||prandom_u32 () > arg->probability)) { + (!arg->probability ||get_random_u32 () > arg->probability)) {if (last)consume_skb (skb);return 0 ;
net/sched/sch_cake.c +1 -1
@@ -573,7 +573,7 @@ static bool cobalt_should_drop(struct cobalt_vars *vars,/* Simple BLUE implementation. Lack of ECN is deliberate. */ if (vars->p_drop) - drop |= (prandom_u32 () < vars->p_drop); + drop |= (get_random_u32 () < vars->p_drop);/* Overload the drop_next field as an activity timeout */ if (!vars->count)
net/sched/sch_netem.c +9 -9
@@ -171,7 +171,7 @@ static inline struct netem_skb_cb *netem_skb_cb(struct sk_buff *skb)static void init_crandom (struct crndstate *state,unsigned long rho) { state->rho = rho; - state->last =prandom_u32 (); + state->last =get_random_u32 (); }/* get_crandom - correlated random number generator
@@ -184,9 +184,9 @@ static u32 get_crandom(struct crndstate *state)unsigned long answer;if (!state || state->rho ==0 )/* no correlation */ -return prandom_u32 (); +return get_random_u32 (); - value =prandom_u32 (); + value =get_random_u32 (); rho = (u64 )state->rho +1 ; answer = (value * ((1ull <<32 ) - rho) + state->last * rho) >>32 ; state->last = answer;
@@ -200,7 +200,7 @@ static u32 get_crandom(struct crndstate *state)static bool loss_4state (struct netem_sched_data *q) {struct clgstate *clg = &q->clg; -u32 rnd =prandom_u32 (); +u32 rnd =get_random_u32 ();/* * Makes a comparison between rnd and the transition
@@ -268,15 +268,15 @@ static bool loss_gilb_ell(struct netem_sched_data *q)switch (clg->state) {case GOOD_STATE : -if (prandom_u32 () < clg->a1) +if (get_random_u32 () < clg->a1) clg->state =BAD_STATE ; -if (prandom_u32 () < clg->a4) +if (get_random_u32 () < clg->a4)return true;break ;case BAD_STATE : -if (prandom_u32 () < clg->a2) +if (get_random_u32 () < clg->a2) clg->state =GOOD_STATE ; -if (prandom_u32 () > clg->a3) +if (get_random_u32 () > clg->a3)return true; }
@@ -632,7 +632,7 @@ static void get_slot_next(struct netem_sched_data *q, u64 now)if (!q->slot_dist) next_delay = q->slot_config.min_delay + - (prandom_u32 () * + (get_random_u32 () * (q->slot_config.max_delay - q->slot_config.min_delay) >>32 );else
net/sunrpc/auth_gss/gss_krb5_wrap.c +2 -2
@@ -130,8 +130,8 @@ gss_krb5_make_confounder(char *p, u32 conflen)/* initialize to random value */ if (i ==0 ) { - i =prandom_u32 (); - i = (i <<32 ) |prandom_u32 (); + i =get_random_u32 (); + i = (i <<32 ) |get_random_u32 (); }switch (conflen) {
net/sunrpc/xprt.c +1 -1
@@ -1868,7 +1868,7 @@ xprt_alloc_xid(struct rpc_xprt *xprt)static void xprt_init_xid (struct rpc_xprt *xprt) { - xprt->xid =prandom_u32 (); + xprt->xid =get_random_u32 (); } static void
net/unix/af_unix.c +1 -1
@@ -1147,7 +1147,7 @@ static int unix_autobind(struct sock *sk) addr->name->sun_family =AF_UNIX ;refcount_set (&addr->refcnt,1 ); - ordernum =prandom_u32 (); + ordernum =get_random_u32 (); lastnum = ordernum &0xFFFFF ; retry: ordernum = (ordernum +1 ) &0xFFFFF ;
Signature · 6 lines
2.37.3 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
Re: [PATCH v6 5/7] treewide: use get_random_u32() when possible
Quoted 7 lines · Jason A. Donenfeld
The
prandom_u32()function has been a deprecated inline wrapper aroundget_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 toget_random_int(), which is just a wrapper aroundget_random_u32(). This was done as a basic find and replace.
Quoted 9 lines
Reviewed-by Greg Kroah-Hartman <[email protected]>Reviewed-by Kees Cook <[email protected]>Reviewed-by Yury Norov <[email protected]>Reviewed-by Jan Kara <[email protected]> # for ext4Signed-off-by Jason A. Donenfeld <[email protected]>
Quoted 2 lines
arch/parisc/kernel/process.c | 2 +- arch/parisc/kernel/sys_parisc.c | 4 ++--
Re: [PATCH v6 5/7] treewide: use get_random_u32() when possible
In reply to Jason A. DonenfeldAm Dienstag, 11. Oktober 2022, 01:06:11 CEST schrieb Jason A. Donenfeld:
Quoted 13 lines
The
prandom_u32()function has been a deprecated inline wrapper aroundget_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 toget_random_int(), which is just a wrapper aroundget_random_u32(). This was done as a basic find and replace.(quoted diff) +0
-0
b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.cindexd0a7465be586..3a7aded30e8e100644
drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c static int brcmf_pno_set_random(struct brcmf_if *ifp, · line 183
Quoted 8 lines
drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c +1
-1@@ -177,7 +177,7 @@ static int brcmf_pno_set_random(struct brcmf_if *ifp, struct brcmf_pno_info *pi) memcpy(pfn_mac.mac, mac_addr, ETH_ALEN);for (i =0 ; i <ETH_ALEN ; i++) { pfn_mac.mac[i] &= mac_mask[i]; - pfn_mac.mac[i] |=get_random_int () & ~(mac_mask[i]); + pfn_mac.mac[i] |=get_random_u32 () & ~(mac_mask[i]); }/* Clear multi bit */ pfn_mac.mac[0 ] &=0xFE ;
mac is defined as u8 mac[ETH_ALEN]; in fwil_types.h.
Eike
P.S.: CC list trimmed because of an unrelated mailer bug
Jason A. Donenfeld
maintainerRe: [PATCH v6 5/7] treewide: use get_random_u32() when possible
Quoted 25 lines · Rolf Eike Beer
Am Dienstag, 11. Oktober 2022, 01:06:11 CEST schrieb Jason A. Donenfeld:
Quoted 13 lines
The
prandom_u32()function has been a deprecated inline wrapper aroundget_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 toget_random_int(), which is just a wrapper aroundget_random_u32(). This was done as a basic find and replace.(quoted diff) +0
-0
b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.cindexd0a7465be586..3a7aded30e8e100644drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c static int brcmf_pno_set_random(struct brcmf_if *ifp, · line 183
Quoted 8 lines
drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c +1
-1@@ -177,7 +177,7 @@ static int brcmf_pno_set_random(struct brcmf_if *ifp, struct brcmf_pno_info *pi) memcpy(pfn_mac.mac, mac_addr, ETH_ALEN);for (i =0 ; i <ETH_ALEN ; i++) { pfn_mac.mac[i] &= mac_mask[i]; - pfn_mac.mac[i] |=get_random_int () & ~(mac_mask[i]); + pfn_mac.mac[i] |=get_random_u32 () & ~(mac_mask[i]); }/* Clear multi bit */ pfn_mac.mac[0 ] &=0xFE ;mac is defined as u8 mac[ETH_ALEN]; in
fwil_types.h.
Quoted 3 lines
Eike
P.S.: CC list trimmed because of an unrelated mailer bug
Nice catch, thanks. Will remove to the get_random_{u16,u8} commit.
Re: [PATCH v6 5/7] treewide: use get_random_u32() when possible
In reply to Jason A. DonenfeldQuoted 16 lines · Jason A. Donenfeld
The
prandom_u32()function has been a deprecated inline wrapper aroundget_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 toget_random_int(), which is just a wrapper aroundget_random_u32(). This was done as a basic find and replace.Reviewed-by Greg Kroah-Hartman <[email protected]>Reviewed-by Kees Cook <[email protected]>Reviewed-by Yury Norov <[email protected]>Reviewed-by Jan Kara <[email protected]> # for ext4Signed-off-by Jason A. Donenfeld <[email protected]>
Quoted 2 lines
--- arch/s390/mm/mmap.c | 2 +-
For s390:
_______________________________________________
linux-um mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-um
Re: [PATCH v6 5/7] treewide: use get_random_u32() when possible
In reply to Jason A. DonenfeldAm Dienstag, 11. Oktober 2022, 01:06:11 CEST schrieb Jason A. Donenfeld:
Quoted 97 lines
The
prandom_u32()function has been a deprecated inline wrapper aroundget_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 toget_random_int(), which is just a wrapper aroundget_random_u32(). This was done as a basic find and replace.Reviewed-by Greg Kroah-Hartman <[email protected]>Reviewed-by Kees Cook <[email protected]>Reviewed-by Yury Norov <[email protected]>Reviewed-by Jan Kara <[email protected]> # for ext4thunderbolt Acked-by: Darrick J. Wong <[email protected]> # for xfs
Signed-off-by Jason A. Donenfeld <[email protected]>--- Documentation/networking/filter.rst | 2 +- arch/parisc/kernel/process.c | 2 +- arch/parisc/kernel/sys_parisc.c | 4 ++-- arch/s390/mm/mmap.c | 2 +- arch/x86/kernel/cpu/amd.c | 2 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 6 +++--- drivers/gpu/drm/i915/selftests/i915_selftest.c | 2 +- drivers/gpu/drm/tests/drm_buddy_test.c | 2 +- drivers/gpu/drm/tests/drm_mm_test.c | 2 +- drivers/infiniband/hw/cxgb4/cm.c | 4 ++-- drivers/infiniband/hw/hfi1/tid_rdma.c | 2 +- drivers/infiniband/hw/mlx4/mad.c | 2 +- drivers/infiniband/ulp/ipoib/ipoib_cm.c | 2 +- drivers/md/raid5-cache.c | 2 +- .../media/test-drivers/vivid/vivid-touch-cap.c | 4 ++-- drivers/misc/habanalabs/gaudi2/gaudi2.c | 2 +- drivers/net/bonding/bond_main.c | 2 +- drivers/net/ethernet/broadcom/cnic.c | 2 +- .../chelsio/inline_crypto/chtls/chtls_cm.c | 2 +- drivers/net/ethernet/rocker/rocker_main.c | 6 +++--- .../wireless/broadcom/brcm80211/brcmfmac/pno.c | 2 +- .../net/wireless/marvell/mwifiex/cfg80211.c | 4 ++-- .../net/wireless/microchip/wilc1000/cfg80211.c | 2 +- .../net/wireless/quantenna/qtnfmac/cfg80211.c | 2 +- drivers/net/wireless/ti/wlcore/main.c | 2 +- drivers/nvme/common/auth.c | 2 +- drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 4 ++-- drivers/target/iscsi/cxgbit/cxgbit_cm.c | 2 +- drivers/thunderbolt/xdomain.c | 2 +- drivers/video/fbdev/uvesafb.c | 2 +- fs/exfat/inode.c | 2 +- fs/ext4/ialloc.c | 2 +- fs/ext4/ioctl.c | 4 ++-- fs/ext4/mmp.c | 2 +- fs/f2fs/namei.c | 2 +- fs/fat/inode.c | 2 +- fs/nfsd/nfs4state.c | 4 ++-- fs/ntfs3/fslog.c | 6 +++--- fs/ubifs/journal.c | 2 +- fs/xfs/libxfs/xfs_ialloc.c | 2 +- fs/xfs/xfs_icache.c | 2 +- fs/xfs/xfs_log.c | 2 +- include/net/netfilter/nf_queue.h | 2 +- include/net/red.h | 2 +- include/net/sock.h | 2 +- kernel/bpf/bloom_filter.c | 2 +- kernel/bpf/core.c | 2 +- kernel/bpf/hashtab.c | 2 +- kernel/bpf/verifier.c | 2 +- kernel/kcsan/selftest.c | 2 +- lib/random32.c | 2 +- lib/reed_solomon/test_rslib.c | 6 +++--- lib/test_fprobe.c | 2 +- lib/test_kprobes.c | 2 +- lib/test_min_heap.c | 6 +++--- lib/test_rhashtable.c | 6 +++--- mm/shmem.c | 2 +- mm/slab.c | 2 +- net/core/pktgen.c | 4 ++-- net/ipv4/route.c | 2 +- net/ipv4/tcp_cdg.c | 2 +- net/ipv4/udp.c | 2 +- net/ipv6/ip6_flowlabel.c | 2 +- net/ipv6/output_core.c | 2 +- net/netfilter/ipvs/ip_vs_conn.c | 2 +- net/netfilter/xt_statistic.c | 2 +- net/openvswitch/actions.c | 2 +- net/sched/sch_cake.c | 2 +- net/sched/sch_netem.c | 18 +++++++++--------- net/sunrpc/auth_gss/gss_krb5_wrap.c | 4 ++-- net/sunrpc/xprt.c | 2 +- net/unix/af_unix.c | 2 +- 72 files changed, 101 insertions(+), 101 deletions(-)lib/test_rhashtable.c +0
-0
lib/test_rhashtable.c static int __init test_rhltable(unsigned int entries) · line 297
Quoted 8 lines
lib/test_rhashtable.c +1
-1@@ -291,7 +291,7 @@ static int __init test_rhltable(unsigned int entries)if (WARN_ON (err)) goto out_free; - k =prandom_u32 (); + k =get_random_u32 (); ret =0 ;for (i =0 ; i < entries; i++) { rhl_test_objects[i].value.id = k;
This one looks ok.
Quoted 5 lines
lib/test_rhashtable.c +0
-1@@ -369,12 +369,12 @@ static int __init test_rhltable(unsigned int entries)pr_info ("test %d random rhlist add/delete operations\n" , entries);for (j =0 ; j < entries; j++) {u32 i =prandom_u32_max (entries); -u32 prand =prandom_u32 ();
lib/test_rhashtable.c static int __init test_rhltable(unsigned int entries) · line 380
Quoted 10 lines
lib/test_rhashtable.c +2
-1+u32 prand =get_random_u32 ();cond_resched ();if (prand ==0 ) - prand =prandom_u32 (); + prand =get_random_u32 ();if (prand &1 ) { prand >>=1 ;
But this doesn't make any sense to me. It needs a bit more context:
Quoted 2 lines
continue; }
Why would one change prand wen it will be overwritten in the next loop anyway?
Quoted 7 lines
err = rhltable_remove(&rhlt, &rhl_test_objects[i].list_node, test_rht_params);
if (test_bit(i, obj_in_table)) {
clear_bit(i, obj_in_table);
if (WARN(err, "cannot remove element at slot %d", i))
continue;
} else {
if (WARN(err != -ENOENT, "removed non-existent element %d, error %d not %d",Quoted 8 lines
i, err, -ENOENT))
continue;
}
if (prand & 1) {
prand >>= 1;
continue;
}The same code again, and in this case it is impossible to reach, as the check already returned false before.
Should these have been something like this in the first place:
if (prand & 1) prand >>=1; else continue;
At least as the code looks now this only ever needs a single bit of randomness, and the later checks and the shift can go away, but I suspect that something else was meant with that code.
Florian, can you comment and maybe fix it? When possible use prandom_u8() as it seems to me that you only need 3 bytes of randomness here anyway.
Or you wanted to move the variable before the loop and keep the random state between the loops and only reseed when all '1' bits have been consumed. But even in this case the later checks seem wrong as the value has not changed in between.
Eike
Florian Westphal
maintainerRe: [PATCH v6 5/7] treewide: use get_random_u32() when possible
Quoted 1 line · Rolf Eike Beer
Florian, can you comment and maybe fix it?
Can't comment, do not remember -- this was 5 years ago.
Quoted 2 lines
Or you wanted to move the variable before the loop and keep the random state between the loops and only reseed when all '1' bits have been consumed.
Probably. No clue, best to NOT change it to not block Jasons series and then just simplify this and remove all the useless shifts.
_______________________________________________
linux-um mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-um
Re: [PATCH v6 5/7] treewide: use get_random_u32() when possible
Am Donnerstag, 13. Oktober 2022, 12:16:35 CEST schrieb Florian Westphal:
Quoted 10 lines
Quoted 1 line · Rolf Eike Beer
Florian, can you comment and maybe fix it?
Can't comment, do not remember -- this was 5 years ago.
Quoted 3 lines
Or you wanted to move the variable before the loop and keep the random state between the loops and only reseed when all '1' bits have been consumed.
Probably. No clue, best to NOT change it to not block Jasons series and then just simplify this and remove all the useless shifts.
Sure. Jason, just in case you are going to do a v7 this could move to u8 then.
Jason A. Donenfeld
maintainerRe: [PATCH v6 5/7] treewide: use get_random_u32() when possible
Quoted 6 lines · Rolf Eike Beer
Am Donnerstag, 13. Oktober 2022, 12:16:35 CEST schrieb Florian Westphal:
Quoted 5 lines
Quoted 1 line · Rolf Eike Beer
Florian, can you comment and maybe fix it?
Can't comment, do not remember -- this was 5 years ago.
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
Or you wanted to move the variable before the loop and keep the random state between the loops and only reseed when all '1' bits have been consumed.
Probably. No clue, best to NOT change it to not block Jasons series and then just simplify this and remove all the useless shifts.
Sure. Jason, just in case you are going to do a v7 this could move to u8 then.
Indeed I think this is one to send individually to netdev@ once the tree opens there for 6.2.
Jason
_______________________________________________
linux-um mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-um
Jason A. Donenfeld
maintainerPATCH v6 6/7 treewide: use get_random_bytes() when possible
In reply to Jason A. DonenfeldThe prandom_bytes() function has been a deprecated inline wrapper around get_random_bytes() for several releases now, and compiles down to the exact same code. Replace the deprecated wrapper with a direct call to the real function. This was done as a basic find and replace.
--- arch/powerpc/crypto/crc-vpmsum_test.c | 2 +- block/blk-crypto-fallback.c | 2 +- crypto/async_tx/raid6test.c | 2 +- drivers/dma/dmatest.c | 2 +- drivers/mtd/nand/raw/nandsim.c | 2 +- drivers/mtd/tests/mtd_nandecctest.c | 2 +- drivers/mtd/tests/speedtest.c | 2 +- drivers/mtd/tests/stresstest.c | 2 +- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 +- drivers/net/ethernet/rocker/rocker_main.c | 2 +- drivers/net/wireguard/selftest/allowedips.c | 12 ++++++------ fs/ubifs/debug.c | 2 +- kernel/kcsan/selftest.c | 2 +- lib/random32.c | 2 +- lib/test_objagg.c | 2 +- lib/uuid.c | 2 +- net/ipv4/route.c | 2 +- net/mac80211/rc80211_minstrel_ht.c | 2 +- net/sched/sch_pie.c | 2 +- 19 files changed, 24 insertions(+), 24 deletions(-)
arch/powerpc/crypto/crc-vpmsum_test.c +1 -1
@@ -82,7 +82,7 @@ static int __init crc_test_init(void)if (len <= offset)continue ; -prandom_bytes (data, len); +get_random_bytes (data, len); len -= offset;crypto_shash_update (crct10dif_shash, data+offset, len);
block/blk-crypto-fallback.c +1 -1
@@ -539,7 +539,7 @@ static int blk_crypto_fallback_init(void)if (blk_crypto_fallback_inited)return 0 ; -prandom_bytes (blank_key,BLK_CRYPTO_MAX_KEY_SIZE ); +get_random_bytes (blank_key,BLK_CRYPTO_MAX_KEY_SIZE ); err =bioset_init (&crypto_bio_split,64 ,0 ,0 );if (err)
crypto/async_tx/raid6test.c +1 -1
@@ -37,7 +37,7 @@ static void makedata(int disks)int i;for (i =0 ; i < disks; i++) { -prandom_bytes (page_address (data[i]),PAGE_SIZE ); +get_random_bytes (page_address (data[i]),PAGE_SIZE ); dataptrs[i] = data[i]; dataoffs[i] =0 ; }
drivers/dma/dmatest.c +1 -1
@@ -312,7 +312,7 @@ static unsigned long dmatest_random(void) {unsigned long buf; -prandom_bytes (&buf,sizeof (buf)); +get_random_bytes (&buf,sizeof (buf));return buf; }
drivers/mtd/nand/raw/nandsim.c +1 -1
@@ -1393,7 +1393,7 @@ static int ns_do_read_error(struct nandsim *ns, int num)unsigned int page_no = ns->regs.row;if (ns_read_error (page_no)) { -prandom_bytes (ns->buf.byte, num); +get_random_bytes (ns->buf.byte, num);NS_WARN ("simulating read error in page %u\n" , page_no);return 1 ; }
drivers/mtd/tests/mtd_nandecctest.c +1 -1
@@ -266,7 +266,7 @@ static int nand_ecc_test_run(const size_t size) goto error; } -prandom_bytes (correct_data, size); +get_random_bytes (correct_data, size);ecc_sw_hamming_calculate (correct_data, size, correct_ecc, sm_order);for (i =0 ; i <ARRAY_SIZE (nand_ecc_test); i++) { nand_ecc_test[i].prepare(error_data, error_ecc,
drivers/mtd/tests/speedtest.c +1 -1
@@ -223,7 +223,7 @@ static int __init mtd_speedtest_init(void)if (!iobuf) goto out; -prandom_bytes (iobuf, mtd->erasesize); +get_random_bytes (iobuf, mtd->erasesize); bbt =kzalloc (ebcnt,GFP_KERNEL );if (!bbt)
drivers/mtd/tests/stresstest.c +1 -1
@@ -183,7 +183,7 @@ static int __init mtd_stresstest_init(void) goto out;for (i =0 ; i < ebcnt; i++) offsets[i] = mtd->erasesize; -prandom_bytes (writebuf, bufsize); +get_random_bytes (writebuf, bufsize); bbt =kzalloc (ebcnt,GFP_KERNEL );if (!bbt)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +1 -1
@@ -3874,7 +3874,7 @@ static void bnxt_init_vnics(struct bnxt *bp)if (bp->vnic_info[i].rss_hash_key) {if (i ==0 ) -prandom_bytes (vnic->rss_hash_key, +get_random_bytes (vnic->rss_hash_key,HW_HASH_KEY_SIZE );else memcpy(vnic->rss_hash_key,
drivers/net/ethernet/rocker/rocker_main.c +1 -1
@@ -224,7 +224,7 @@ static int rocker_dma_test_offset(const struct rocker *rocker,if (err) goto unmap; -prandom_bytes (buf,ROCKER_TEST_DMA_BUF_SIZE ); +get_random_bytes (buf,ROCKER_TEST_DMA_BUF_SIZE );for (i =0 ; i <ROCKER_TEST_DMA_BUF_SIZE ; i++) expect[i] = ~buf[i]; err = rocker_dma_test_one(rocker, wait, ROCKER_TEST_DMA_CTRL_INVERT,
drivers/net/wireguard/selftest/allowedips.c +6 -6
@@ -284,7 +284,7 @@ static __init bool randomized_test(void)mutex_lock (&mutex);for (i =0 ; i <NUM_RAND_ROUTES ; ++i) { -prandom_bytes (ip,4 ); +get_random_bytes (ip,4 ); cidr =prandom_u32_max (32 ) +1 ; peer = peers[prandom_u32_max (NUM_PEERS )]; if (wg_allowedips_insert_v4(&t, (struct in_addr *)ip, cidr,
@@ -299,7 +299,7 @@ static __init bool randomized_test(void) }for (j =0 ; j <NUM_MUTATED_ROUTES ; ++j) {memcpy (mutated, ip,4 ); -prandom_bytes (mutate_mask,4 ); +get_random_bytes (mutate_mask,4 ); mutate_amount =prandom_u32_max (32 );for (k =0 ; k < mutate_amount /8 ; ++k) mutate_mask[k] =0xff ;
@@ -328,7 +328,7 @@ static __init bool randomized_test(void) }for (i =0 ; i <NUM_RAND_ROUTES ; ++i) { -prandom_bytes (ip,16 ); +get_random_bytes (ip,16 ); cidr =prandom_u32_max (128 ) +1 ; peer = peers[prandom_u32_max (NUM_PEERS )]; if (wg_allowedips_insert_v6(&t, (struct in6_addr *)ip, cidr,
@@ -343,7 +343,7 @@ static __init bool randomized_test(void) }for (j =0 ; j <NUM_MUTATED_ROUTES ; ++j) {memcpy (mutated, ip,16 ); -prandom_bytes (mutate_mask,16 ); +get_random_bytes (mutate_mask,16 ); mutate_amount =prandom_u32_max (128 );for (k =0 ; k < mutate_amount /8 ; ++k) mutate_mask[k] =0xff ;
@@ -381,13 +381,13 @@ static __init bool randomized_test(void)for (j =0 ;; ++j) {for (i =0 ; i <NUM_QUERIES ; ++i) { -prandom_bytes (ip,4 ); +get_random_bytes (ip,4 );if (lookup (t.root4,32 , ip) !=horrible_allowedips_lookup_v4 (&h, (struct in_addr *)ip)) {horrible_allowedips_lookup_v4 (&h, (struct in_addr *)ip);pr_err ("allowedips random v4 self-test: FAIL\n" ); goto free; } -prandom_bytes (ip,16 ); +get_random_bytes (ip,16 );if (lookup (t.root6,128 , ip) !=horrible_allowedips_lookup_v6 (&h, (struct in6_addr *)ip)) {pr_err ("allowedips random v6 self-test: FAIL\n" ); goto free;
fs/ubifs/debug.c +1 -1
@@ -2581,7 +2581,7 @@ static int corrupt_data(const struct ubifs_info *c, const void *buf,if (ffs)memset (p + from,0xFF , to - from);else -prandom_bytes (p + from, to - from); +get_random_bytes (p + from, to - from);return to; }
kernel/kcsan/selftest.c +1 -1
@@ -46,7 +46,7 @@ static bool __init test_encode_decode(void)unsigned long addr;size_t verif_size; -prandom_bytes (&addr,sizeof (addr)); +get_random_bytes (&addr,sizeof (addr));if (addr <PAGE_SIZE ) addr =PAGE_SIZE ;
lib/random32.c +1 -1
@@ -69,7 +69,7 @@ EXPORT_SYMBOL(prandom_u32_state);* @bytes: the requested number of bytes * * This is used for pseudo-randomness with no outside seeding. -* For more random results, use prandom_bytes(). +* For more random results, use get_random_bytes(). */ void prandom_bytes_state (struct rnd_state *state,void *buf,size_t bytes) {
lib/test_objagg.c +1 -1
@@ -157,7 +157,7 @@ static int test_nodelta_obj_get(struct world *world, struct objagg *objagg,int err;if (should_create_root) -prandom_bytes (world->next_root_buf, +get_random_bytes (world->next_root_buf,sizeof (world->next_root_buf)); objagg_obj =world_obj_get (world, objagg, key_id);
lib/uuid.c +1 -1
@@ -52,7 +52,7 @@ EXPORT_SYMBOL(generate_random_guid);static void __uuid_gen_common (__u8 b[16 ]) { -prandom_bytes (b,16 ); +get_random_bytes (b,16 );/* reversion 0b10 */ b[8 ] = (b[8 ] &0x3F ) |0x80 ; }
net/ipv4/route.c +1 -1
@@ -3719,7 +3719,7 @@ int __init ip_rt_init(void) ip_idents = idents_hash; -prandom_bytes (ip_idents, (ip_idents_mask +1 ) *sizeof (*ip_idents)); +get_random_bytes (ip_idents, (ip_idents_mask +1 ) *sizeof (*ip_idents)); ip_tstamps = idents_hash + (ip_idents_mask +1 ) *sizeof (*ip_idents);
net/mac80211/rc80211_minstrel_ht.c +1 -1
@@ -2036,7 +2036,7 @@ static void __init init_sample_table(void)memset (sample_table,0xff ,sizeof (sample_table));for (col =0 ; col <SAMPLE_COLUMNS ; col++) { -prandom_bytes (rnd,sizeof (rnd)); +get_random_bytes (rnd,sizeof (rnd));for (i =0 ; i <MCS_GROUP_RATES ; i++) { new_idx = (i + rnd[i]) %MCS_GROUP_RATES ;while (sample_table[col][new_idx] !=0xff )
net/sched/sch_pie.c +1 -1
@@ -72,7 +72,7 @@ bool pie_drop_early(struct Qdisc *sch, struct pie_params *params,if (vars->accu_prob >= (MAX_PROB /2 ) *17 )return true; -prandom_bytes (&rnd,8 ); +get_random_bytes (&rnd,8 );if ((rnd >>BITS_PER_BYTE ) < local_prob) { vars->accu_prob =0 ;return true;
Signature · 7 lines
2.37.3 _______________________________________________ linux-um mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-um
Jason A. Donenfeld
maintainerPATCH v6 7/7 prandom: remove unused functions
In reply to Jason A. DonenfeldWith 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().
--- drivers/char/random.c | 11 +++++------ include/linux/prandom.h | 12 ------------ include/linux/random.h | 5 ----- 3 files changed, 5 insertions(+), 23 deletions(-)
drivers/char/random.c +5 -6
@@ -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
@@ -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
@@ -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
Signature · 6 lines
2.37.3 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
Quoted 6 lines · On Mon, 10 Oct 2022 17:06:06 -0600 Jason A. Donenfeld wrote:
- If you want a secure or an insecure random u64, use
get_random_u64().
- If you want a secure or an insecure random u32, useget_random_u32().
* The old functionprandom_u32()has been deprecated for a while now and is just a wrapper aroundget_random_u32(). Same forget_random_int().
- If you want a secure or an insecure random u16, useget_random_u16().
Quoted 8 lines
- If you want a secure or an insecure random u8, use
get_random_u8().
- If you want secure or insecure random bytes, useget_random_bytes().
* The old functionprandom_bytes()has been deprecated for a while now and has long been a wrapper aroundget_random_bytes().
- If you want a non-uniform random u32, u16, or u8 bounded by a certain open interval maximum, useprandom_u32_max().
* I say "non-uniform", because it doesn't do any rejection sampling or divisions. Hence, it stays within the prandom_* namespace.
_______________________________________________
linux-um mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-um
On 2022/10/11 7:06, Jason A. Donenfeld Wrote:
Quoted 346 lines
Changes
v5->v6:
- Added a few missing conversions that weren't in my older tree, so now this should be ready to go, as well as a couple nits people had from v5. Barring something large and unforeseen, this is the "final version", as this is ready to ship. Thanks to everyone who reviewed this.Hi folks,
This is a five part treewide cleanup of random integer handling. The rules for random integers are:
- If you want a secure or an insecure random u64, use
get_random_u64().
- If you want a secure or an insecure random u32, useget_random_u32().
* The old functionprandom_u32()has been deprecated for a while now and is just a wrapper aroundget_random_u32(). Same forget_random_int().
- If you want a secure or an insecure random u16, useget_random_u16().
- If you want a secure or an insecure random u8, useget_random_u8().
- If you want secure or insecure random bytes, useget_random_bytes().
* The old functionprandom_bytes()has been deprecated for a while now and has long been a wrapper aroundget_random_bytes().
- If you want a non-uniform random u32, u16, or u8 bounded by a certain open interval maximum, useprandom_u32_max().
* I say "non-uniform", because it doesn't do any rejection sampling or divisions. Hence, it stays within the prandom_* namespace.These rules ought to be applied uniformly, so that we can clean up the deprecated functions, and earn the benefits of using the modern functions. In particular, in addition to the boring substitutions, this patchset accomplishes a few nice effects:
- By using
prandom_u32_max()with an upper-bound that the compiler can prove at compile-time is ≤65536 or ≤256, internallyget_random_u16()orget_random_u8()is used, which wastes fewer batched random bytes, and hence has higher throughput.- By using
prandom_u32_max()instead of %, when the upper-bound is not a constant, division is still avoided, becauseprandom_u32_max()uses a faster multiplication-based trick instead.- By using
get_random_u16()orget_random_u8()in cases where the return value is intended to indeed be a u16 or a u8, we waste fewer batched random bytes, and hence have higher throughput.So, based on those rules and benefits from following them, this patchset breaks down into the following five steps:
1) Replace
prandom_u32() % maxand variants thereof withprandom_u32_max(max).* Part 1 is done with Coccinelle. Part 2 is done by hand.
2) Replace
(type)get_random_u32()and variants thereof withget_random_u16()orget_random_u8(). I took the pains to actually look and see what every lvalue type was across the entire tree.* Part 1 is done with Coccinelle. Part 2 is done by hand.
3) Replace remaining deprecated uses of
prandom_u32()andget_random_int()withget_random_u32().* A boring search and replace operation.
4) Replace remaining deprecated uses of
prandom_bytes()withget_random_bytes().* A boring search and replace operation.
5) Remove the deprecated and now-unused
prandom_u32()andprandom_bytes()inline wrapper functions.* Just deleting code and updating comments.
I'll be sending this toward the end of the 6.1 merge window via the random.git tree.
Please take a look! The number of lines touched is quite small, so this should be reviewable, and as much as is possible has been pushed into Coccinelle scripts.
Thanks,
JasonCc Andreas Noever <[email protected]>Cc Andrew Morton <[email protected]>Cc Andy Shevchenko <[email protected]>Cc Borislav Petkov <[email protected]>Cc Catalin Marinas <[email protected]>Cc Christoph Böhmwalder <[email protected]>Cc Christoph Hellwig <[email protected]>Cc Christophe Leroy <[email protected]>Cc Daniel Borkmann <[email protected]>Cc Dave Airlie <[email protected]>Cc Dave Hansen <[email protected]>Cc David S. Miller <[email protected]>Cc Eric Dumazet <[email protected]>Cc Florian Westphal <[email protected]>Cc Greg Kroah-Hartman <[email protected]>,Cc H. Peter Anvin <[email protected]>Cc Heiko Carstens <[email protected]>Cc Helge Deller <[email protected]>Cc Herbert Xu <[email protected]>Cc Huacai Chen <[email protected]>Cc Hugh Dickins <[email protected]>Cc Jakub Kicinski <[email protected]>Cc James E.J. Bottomley <[email protected]>Cc Jan Kara <[email protected]>Cc Jason Gunthorpe <[email protected]>Cc Jens Axboe <[email protected]>Cc Johannes Berg <[email protected]>Cc Jonathan Corbet <[email protected]>Cc Jozsef Kadlecsik <[email protected]>Cc KP Singh <[email protected]>Cc Kees Cook <[email protected]>Cc Marco Elver <[email protected]>Cc Mauro Carvalho Chehab <[email protected]>Cc Michael Ellerman <[email protected]>Cc Pablo Neira Ayuso <[email protected]>Cc Paolo Abeni <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Richard Weinberger <[email protected]>Cc Russell King <[email protected]>Cc Theodore Ts'o <[email protected]>Cc Thomas Bogendoerfer <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Thomas Graf <[email protected]>Cc Ulf Hansson <[email protected]>Cc Vignesh Raghavendra <[email protected]>Cc WANG Xuerui <[email protected]>Cc Will Deacon <[email protected]>Cc Yury Norov <[email protected]>Jason A. Donenfeld (7):
treewide: useprandom_u32_max()when possible, part 1
treewide: useprandom_u32_max()when possible, part 2
treewide: use get_random_{u8,u16}() when possible, part 1
treewide: use get_random_{u8,u16}() when possible, part 2
treewide: useget_random_u32()when possible
treewide: useget_random_bytes()when possible
prandom: remove unused functionsDocumentation/networking/filter.rst | 2 +- arch/arm/kernel/process.c | 2 +- arch/arm/kernel/signal.c | 2 +- arch/arm64/kernel/process.c | 2 +- arch/arm64/kernel/syscall.c | 2 +- arch/loongarch/kernel/process.c | 2 +- arch/loongarch/kernel/vdso.c | 2 +- arch/mips/kernel/process.c | 2 +- arch/mips/kernel/vdso.c | 2 +- arch/parisc/kernel/process.c | 2 +- arch/parisc/kernel/sys_parisc.c | 4 +- arch/parisc/kernel/vdso.c | 2 +- arch/powerpc/crypto/crc-vpmsum_test.c | 2 +- arch/powerpc/kernel/process.c | 2 +- arch/s390/kernel/process.c | 4 +- arch/s390/kernel/vdso.c | 2 +- arch/s390/mm/mmap.c | 2 +- arch/sparc/vdso/vma.c | 2 +- arch/um/kernel/process.c | 2 +- arch/x86/entry/vdso/vma.c | 2 +- arch/x86/kernel/cpu/amd.c | 2 +- arch/x86/kernel/module.c | 2 +- arch/x86/kernel/process.c | 2 +- arch/x86/mm/pat/cpa-test.c | 4 +- block/blk-crypto-fallback.c | 2 +- crypto/async_tx/raid6test.c | 2 +- crypto/testmgr.c | 94 +++++++++---------- drivers/block/drbd/drbd_receiver.c | 4 +- drivers/char/random.c | 11 +-- drivers/dma/dmatest.c | 2 +- .../gpu/drm/i915/gem/i915_gem_execbuffer.c | 2 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 6 +- .../gpu/drm/i915/selftests/i915_selftest.c | 2 +- drivers/gpu/drm/tests/drm_buddy_test.c | 2 +- drivers/gpu/drm/tests/drm_mm_test.c | 2 +- drivers/infiniband/core/cma.c | 2 +- drivers/infiniband/hw/cxgb4/cm.c | 4 +- drivers/infiniband/hw/cxgb4/id_table.c | 4 +- drivers/infiniband/hw/hfi1/tid_rdma.c | 2 +- drivers/infiniband/hw/hns/hns_roce_ah.c | 5 +- drivers/infiniband/hw/mlx4/mad.c | 2 +- drivers/infiniband/ulp/ipoib/ipoib_cm.c | 2 +- drivers/infiniband/ulp/rtrs/rtrs-clt.c | 3 +- drivers/md/bcache/request.c | 2 +- drivers/md/raid5-cache.c | 2 +- drivers/media/common/v4l2-tpg/v4l2-tpg-core.c | 2 +- .../media/test-drivers/vivid/vivid-radio-rx.c | 4 +- .../test-drivers/vivid/vivid-touch-cap.c | 6 +- drivers/misc/habanalabs/gaudi2/gaudi2.c | 2 +- drivers/mmc/core/core.c | 4 +- drivers/mmc/host/dw_mmc.c | 2 +- drivers/mtd/nand/raw/nandsim.c | 8 +- drivers/mtd/tests/mtd_nandecctest.c | 12 +-- drivers/mtd/tests/speedtest.c | 2 +- drivers/mtd/tests/stresstest.c | 19 +--- drivers/mtd/ubi/debug.c | 2 +- drivers/mtd/ubi/debug.h | 6 +- drivers/net/bonding/bond_main.c | 2 +- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 +- drivers/net/ethernet/broadcom/cnic.c | 5 +- .../chelsio/inline_crypto/chtls/chtls_cm.c | 4 +- .../chelsio/inline_crypto/chtls/chtls_io.c | 4 +- drivers/net/ethernet/rocker/rocker_main.c | 8 +- drivers/net/hamradio/baycom_epp.c | 2 +- drivers/net/hamradio/hdlcdrv.c | 2 +- drivers/net/hamradio/yam.c | 2 +- drivers/net/phy/at803x.c | 2 +- drivers/net/wireguard/selftest/allowedips.c | 16 ++-- .../broadcom/brcm80211/brcmfmac/p2p.c | 2 +- .../broadcom/brcm80211/brcmfmac/pno.c | 2 +- .../net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 2 +- .../net/wireless/marvell/mwifiex/cfg80211.c | 4 +- .../wireless/microchip/wilc1000/cfg80211.c | 2 +- .../net/wireless/quantenna/qtnfmac/cfg80211.c | 2 +- drivers/net/wireless/st/cw1200/wsm.c | 2 +- drivers/net/wireless/ti/wlcore/main.c | 2 +- drivers/nvme/common/auth.c | 2 +- drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 4 +- drivers/scsi/fcoe/fcoe_ctlr.c | 4 +- drivers/scsi/lpfc/lpfc_hbadisc.c | 6 +- drivers/scsi/qedi/qedi_main.c | 2 +- drivers/target/iscsi/cxgbit/cxgbit_cm.c | 2 +- drivers/thunderbolt/xdomain.c | 2 +- drivers/video/fbdev/uvesafb.c | 2 +- fs/ceph/inode.c | 2 +- fs/ceph/mdsmap.c | 2 +- fs/exfat/inode.c | 2 +- fs/ext2/ialloc.c | 3 +- fs/ext4/ialloc.c | 7 +- fs/ext4/ioctl.c | 4 +- fs/ext4/mmp.c | 2 +- fs/ext4/super.c | 7 +- fs/f2fs/gc.c | 2 +- fs/f2fs/namei.c | 2 +- fs/f2fs/segment.c | 8 +- fs/fat/inode.c | 2 +- fs/nfsd/nfs4state.c | 4 +- fs/ntfs3/fslog.c | 6 +- fs/ubifs/debug.c | 10 +- fs/ubifs/journal.c | 2 +- fs/ubifs/lpt_commit.c | 14 +-- fs/ubifs/tnc_commit.c | 2 +- fs/xfs/libxfs/xfs_alloc.c | 2 +- fs/xfs/libxfs/xfs_ialloc.c | 4 +- fs/xfs/xfs_error.c | 2 +- fs/xfs/xfs_icache.c | 2 +- fs/xfs/xfs_log.c | 2 +- include/linux/nodemask.h | 2 +- include/linux/prandom.h | 12 --- include/linux/random.h | 5 - include/net/netfilter/nf_queue.h | 2 +- include/net/red.h | 2 +- include/net/sock.h | 2 +- kernel/bpf/bloom_filter.c | 2 +- kernel/bpf/core.c | 6 +- kernel/bpf/hashtab.c | 2 +- kernel/bpf/verifier.c | 2 +- kernel/kcsan/selftest.c | 4 +- kernel/locking/test-ww_mutex.c | 4 +- kernel/time/clocksource.c | 2 +- lib/cmdline_kunit.c | 4 +- lib/fault-inject.c | 2 +- lib/find_bit_benchmark.c | 4 +- lib/kobject.c | 2 +- lib/random32.c | 4 +- lib/reed_solomon/test_rslib.c | 12 +-- lib/sbitmap.c | 4 +- lib/test-string_helpers.c | 2 +- lib/test_fprobe.c | 2 +- lib/test_hexdump.c | 10 +- lib/test_kasan.c | 6 +- lib/test_kprobes.c | 2 +- lib/test_list_sort.c | 2 +- lib/test_min_heap.c | 6 +- lib/test_objagg.c | 2 +- lib/test_rhashtable.c | 6 +- lib/test_vmalloc.c | 19 +--- lib/uuid.c | 2 +- mm/migrate.c | 2 +- mm/shmem.c | 2 +- mm/slab.c | 2 +- mm/slub.c | 2 +- net/802/garp.c | 2 +- net/802/mrp.c | 2 +- net/ceph/mon_client.c | 2 +- net/ceph/osd_client.c | 2 +- net/core/neighbour.c | 2 +- net/core/pktgen.c | 47 +++++----- net/core/stream.c | 2 +- net/dccp/ipv4.c | 4 +- net/ipv4/datagram.c | 2 +- net/ipv4/igmp.c | 6 +- net/ipv4/inet_connection_sock.c | 2 +- net/ipv4/inet_hashtables.c | 2 +- net/ipv4/ip_output.c | 2 +- net/ipv4/route.c | 4 +- net/ipv4/tcp_cdg.c | 2 +- net/ipv4/tcp_ipv4.c | 4 +- net/ipv4/udp.c | 2 +- net/ipv6/addrconf.c | 8 +- net/ipv6/ip6_flowlabel.c | 2 +- net/ipv6/mcast.c | 10 +- net/ipv6/output_core.c | 2 +- net/mac80211/rc80211_minstrel_ht.c | 2 +- net/mac80211/scan.c | 2 +- net/netfilter/ipvs/ip_vs_conn.c | 2 +- net/netfilter/ipvs/ip_vs_twos.c | 4 +- net/netfilter/nf_nat_core.c | 4 +- net/netfilter/xt_statistic.c | 2 +- net/openvswitch/actions.c | 2 +- net/packet/af_packet.c | 2 +- net/rds/bind.c | 2 +- net/sched/act_gact.c | 2 +- net/sched/act_sample.c | 2 +- net/sched/sch_cake.c | 8 +- net/sched/sch_netem.c | 22 ++--- net/sched/sch_pie.c | 2 +- net/sched/sch_sfb.c | 2 +- net/sctp/socket.c | 4 +-
Quoted 9 lines
net/sunrpc/auth_gss/gss_krb5_wrap.c | 4 +- net/sunrpc/cache.c | 2 +- net/sunrpc/xprt.c | 2 +- net/sunrpc/xprtsock.c | 2 +- net/tipc/socket.c | 2 +- net/unix/af_unix.c | 2 +- net/xfrm/xfrm_state.c | 2 +- 186 files changed, 379 insertions(+), 422 deletions(-)
Hi, Jason:
There is a lot of code using "prandom_u32 % 4" in crypto's kernel self-test file testmgr.c, can you modify it together?
Thanks,
Longfang.