]> git.itanic.dy.fi Git - linux-stable/commit
treewide: use prandom_u32_max() when possible, part 1
authorJason A. Donenfeld <Jason@zx2c4.com>
Wed, 5 Oct 2022 14:43:38 +0000 (16:43 +0200)
committerJason A. Donenfeld <Jason@zx2c4.com>
Tue, 11 Oct 2022 23:42:55 +0000 (17:42 -0600)
commit81895a65ec63ee1daec3255dc1a06675d2fbe915
tree03703a64413a07bd4e6a171a449a8f18c760e21c
parentd465bff130bf4ca17b6980abe51164ace1e0cba4
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
 }

Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Yury Norov <yury.norov@gmail.com>
Reviewed-by: KP Singh <kpsingh@kernel.org>
Reviewed-by: Jan Kara <jack@suse.cz> # for ext4 and sbitmap
Reviewed-by: Christoph Böhmwalder <christoph.boehmwalder@linbit.com> # for drbd
Acked-by: Jakub Kicinski <kuba@kernel.org>
Acked-by: Heiko Carstens <hca@linux.ibm.com> # for s390
Acked-by: Ulf Hansson <ulf.hansson@linaro.org> # for mmc
Acked-by: Darrick J. Wong <djwong@kernel.org> # for xfs
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
89 files changed:
arch/arm/kernel/process.c
arch/arm64/kernel/process.c
arch/loongarch/kernel/process.c
arch/loongarch/kernel/vdso.c
arch/mips/kernel/process.c
arch/mips/kernel/vdso.c
arch/parisc/kernel/vdso.c
arch/powerpc/kernel/process.c
arch/s390/kernel/process.c
arch/s390/kernel/vdso.c
arch/sparc/vdso/vma.c
arch/um/kernel/process.c
arch/x86/entry/vdso/vma.c
arch/x86/kernel/module.c
arch/x86/kernel/process.c
arch/x86/mm/pat/cpa-test.c
crypto/testmgr.c
drivers/block/drbd/drbd_receiver.c
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
drivers/infiniband/core/cma.c
drivers/infiniband/hw/cxgb4/id_table.c
drivers/infiniband/hw/hns/hns_roce_ah.c
drivers/infiniband/ulp/rtrs/rtrs-clt.c
drivers/md/bcache/request.c
drivers/media/test-drivers/vivid/vivid-touch-cap.c
drivers/mmc/core/core.c
drivers/mmc/host/dw_mmc.c
drivers/mtd/nand/raw/nandsim.c
drivers/mtd/tests/mtd_nandecctest.c
drivers/mtd/tests/stresstest.c
drivers/mtd/ubi/debug.c
drivers/mtd/ubi/debug.h
drivers/net/ethernet/broadcom/cnic.c
drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_io.c
drivers/net/hamradio/baycom_epp.c
drivers/net/hamradio/hdlcdrv.c
drivers/net/hamradio/yam.c
drivers/net/phy/at803x.c
drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
drivers/scsi/fcoe/fcoe_ctlr.c
drivers/scsi/qedi/qedi_main.c
fs/ceph/inode.c
fs/ceph/mdsmap.c
fs/ext4/super.c
fs/f2fs/gc.c
fs/f2fs/segment.c
fs/ubifs/debug.c
fs/ubifs/lpt_commit.c
fs/ubifs/tnc_commit.c
fs/xfs/libxfs/xfs_alloc.c
fs/xfs/libxfs/xfs_ialloc.c
fs/xfs/xfs_error.c
include/linux/nodemask.h
kernel/bpf/core.c
kernel/locking/test-ww_mutex.c
kernel/time/clocksource.c
lib/fault-inject.c
lib/find_bit_benchmark.c
lib/kobject.c
lib/reed_solomon/test_rslib.c
lib/sbitmap.c
lib/test-string_helpers.c
lib/test_hexdump.c
lib/test_list_sort.c
mm/kasan/kasan_test.c
mm/slub.c
net/802/garp.c
net/802/mrp.c
net/ceph/mon_client.c
net/ceph/osd_client.c
net/core/neighbour.c
net/core/pktgen.c
net/core/stream.c
net/ipv4/igmp.c
net/ipv4/inet_connection_sock.c
net/ipv4/inet_hashtables.c
net/ipv6/addrconf.c
net/ipv6/mcast.c
net/netfilter/ipvs/ip_vs_twos.c
net/packet/af_packet.c
net/sched/act_gact.c
net/sched/act_sample.c
net/sched/sch_netem.c
net/sctp/socket.c
net/sunrpc/cache.c
net/sunrpc/xprtsock.c
net/tipc/socket.c
net/xfrm/xfrm_state.c