From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B3E90C43219 for ; Fri, 7 Oct 2022 18:03:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229802AbiJGSDo (ORCPT ); Fri, 7 Oct 2022 14:03:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60744 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229934AbiJGSCW (ORCPT ); Fri, 7 Oct 2022 14:02:22 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CD9C6108DD0; Fri, 7 Oct 2022 11:01:57 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 8E899B8214F; Fri, 7 Oct 2022 18:01:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3A591C433D6; Fri, 7 Oct 2022 18:01:48 +0000 (UTC) Authentication-Results: smtp.kernel.org; dkim=pass (1024-bit key) header.d=zx2c4.com header.i=@zx2c4.com header.b="gIpGeUR7" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zx2c4.com; s=20210105; t=1665165707; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=g2hIaC3XOM+KBWgkgbeW6UolDFW2WI2qSTHxKo7C8lY=; b=gIpGeUR7sH1a6vtvGheu2jhFVKZ2WKWz618uTZei7ExED40VBISjDiUH3Wks3xNjWIbn2L KrLDWZgyAe8MER/jEjQGBixBuPnt1RXSzdZ7XCst7BKQWWTcJ2raDjXjyod6bjNA706eue 3Th9FAhERXoQMCcsjJ7QVI7AGmu40G8= Received: by mail.zx2c4.com (ZX2C4 Mail Server) with ESMTPSA id 05093213 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Fri, 7 Oct 2022 18:01:46 +0000 (UTC) From: "Jason A. Donenfeld" To: linux-kernel@vger.kernel.org, patches@lists.linux.dev Cc: "Jason A. Donenfeld" , Andreas Noever , Andrew Morton , Andy Shevchenko , Borislav Petkov , Catalin Marinas , =?UTF-8?q?Christoph=20B=C3=B6hmwalder?= , Christoph Hellwig , Christophe Leroy , Daniel Borkmann , Dave Airlie , Dave Hansen , "David S . Miller" , Eric Dumazet , Florian Westphal , Greg Kroah-Hartman , "H . Peter Anvin" , Heiko Carstens , Helge Deller , Herbert Xu , Huacai Chen , Hugh Dickins , Jakub Kicinski , "James E . J . Bottomley" , Jan Kara , Jason Gunthorpe , Jens Axboe , Johannes Berg , Jonathan Corbet , Jozsef Kadlecsik , KP Singh , Kees Cook , Marco Elver , Mauro Carvalho Chehab , Michael Ellerman , Pablo Neira Ayuso , Paolo Abeni , Peter Zijlstra , Richard Weinberger , Russell King , Theodore Ts'o , Thomas Bogendoerfer , Thomas Gleixner , Thomas Graf , Ulf Hansson , Vignesh Raghavendra , WANG Xuerui , Will Deacon , Yury Norov , dri-devel@lists.freedesktop.org, kasan-dev@googlegroups.com, kernel-janitors@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-block@vger.kernel.org, linux-crypto@vger.kernel.org, linux-doc@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-media@vger.kernel.org, linux-mips@vger.kernel.org, linux-mm@kvack.org, linux-mmc@vger.kernel.org, linux-mtd@lists.infradead.org, linux-nvme@lists.infradead.org, linux-parisc@vger.kernel.org, linux-rdma@vger.kernel.org, linux-s390@vger.kernel.org, linux-um@lists.infradead.org, linux-usb@vger.kernel.org, linux-wireless@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, loongarch@lists.linux.dev, netdev@vger.kernel.org, sparclinux@vger.kernel.org, x86@kernel.org, =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= Subject: [PATCH v4 3/6] treewide: use get_random_{u8,u16}() when possible Date: Fri, 7 Oct 2022 12:01:04 -0600 Message-Id: <20221007180107.216067-4-Jason@zx2c4.com> In-Reply-To: <20221007180107.216067-1-Jason@zx2c4.com> References: <20221007180107.216067-1-Jason@zx2c4.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: kernel-janitors@vger.kernel.org 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. Reviewed-by: Kees Cook Acked-by: Toke Høiland-Jørgensen # for sch_cake Signed-off-by: Jason A. Donenfeld --- arch/arm/kernel/signal.c | 2 +- arch/arm64/kernel/syscall.c | 2 +- arch/s390/kernel/process.c | 2 +- arch/sparc/vdso/vma.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 ++-- lib/test_vmalloc.c | 2 +- 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/sched/sch_sfb.c | 2 +- net/sctp/socket.c | 2 +- 25 files changed, 38 insertions(+), 38 deletions(-) diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c index ea128e32e8ca..e07f359254c3 100644 --- a/arch/arm/kernel/signal.c +++ b/arch/arm/kernel/signal.c @@ -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 */ diff --git a/arch/arm64/kernel/syscall.c b/arch/arm64/kernel/syscall.c index 733451fe7e41..d72e8f23422d 100644 --- a/arch/arm64/kernel/syscall.c +++ b/arch/arm64/kernel/syscall.c @@ -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) diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c index 5ec78555dd2e..42af4b3aa02b 100644 --- a/arch/s390/kernel/process.c +++ b/arch/s390/kernel/process.c @@ -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) diff --git a/arch/sparc/vdso/vma.c b/arch/sparc/vdso/vma.c index cc19e09b0fa1..04ee726859ca 100644 --- a/arch/sparc/vdso/vma.c +++ b/arch/sparc/vdso/vma.c @@ -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 = get_random_u16() & (PTRS_PER_PTE - 1); return start + (offset << PAGE_SHIFT); } diff --git a/crypto/testmgr.c b/crypto/testmgr.c index be45217acde4..981c637fa2ed 100644 --- a/crypto/testmgr.c +++ b/crypto/testmgr.c @@ -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(); } } diff --git a/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c b/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c index 9b7bcdce6e44..303d02b1d71c 100644 --- a/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c +++ b/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c @@ -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) { diff --git a/drivers/media/test-drivers/vivid/vivid-radio-rx.c b/drivers/media/test-drivers/vivid/vivid-radio-rx.c index 232cab508f48..8bd09589fb15 100644 --- a/drivers/media/test-drivers/vivid/vivid-radio-rx.c +++ b/drivers/media/test-drivers/vivid/vivid-radio-rx.c @@ -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) diff --git a/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c b/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c index ddfe9208529a..ac452a0111a9 100644 --- a/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c +++ b/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c @@ -1467,7 +1467,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)) diff --git a/drivers/net/hamradio/baycom_epp.c b/drivers/net/hamradio/baycom_epp.c index 7df78a721b04..791b4a53d69f 100644 --- a/drivers/net/hamradio/baycom_epp.c +++ b/drivers/net/hamradio/baycom_epp.c @@ -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; } } diff --git a/drivers/net/hamradio/hdlcdrv.c b/drivers/net/hamradio/hdlcdrv.c index 360d041a62c4..6c6f11d3d0aa 100644 --- a/drivers/net/hamradio/hdlcdrv.c +++ b/drivers/net/hamradio/hdlcdrv.c @@ -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); } diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c index 97a6cc5c7ae8..2ed2f836f09a 100644 --- a/drivers/net/hamradio/yam.c +++ b/drivers/net/hamradio/yam.c @@ -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); diff --git a/drivers/net/wireguard/selftest/allowedips.c b/drivers/net/wireguard/selftest/allowedips.c index 41db10f9be49..dd897c0740a2 100644 --- a/drivers/net/wireguard/selftest/allowedips.c +++ b/drivers/net/wireguard/selftest/allowedips.c @@ -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, diff --git a/drivers/net/wireless/st/cw1200/wsm.c b/drivers/net/wireless/st/cw1200/wsm.c index 5a3e7a626702..4a9e4b5d3547 100644 --- a/drivers/net/wireless/st/cw1200/wsm.c +++ b/drivers/net/wireless/st/cw1200/wsm.c @@ -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; diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c index 2645def612e6..26d1779cb570 100644 --- a/drivers/scsi/lpfc/lpfc_hbadisc.c +++ b/drivers/scsi/lpfc/lpfc_hbadisc.c @@ -2150,8 +2150,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 @@ -2163,7 +2163,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) diff --git a/lib/cmdline_kunit.c b/lib/cmdline_kunit.c index a72a2c16066e..d4572dbc9145 100644 --- a/lib/cmdline_kunit.c +++ b/lib/cmdline_kunit.c @@ -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. diff --git a/lib/test_vmalloc.c b/lib/test_vmalloc.c index 56ffaa8dd3f6..0131ed2cd1bd 100644 --- a/lib/test_vmalloc.c +++ b/lib/test_vmalloc.c @@ -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. diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c index da6e3b20cd75..301799e7fa56 100644 --- a/net/dccp/ipv4.c +++ b/net/dccp/ipv4.c @@ -123,7 +123,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; @@ -422,7 +422,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; diff --git a/net/ipv4/datagram.c b/net/ipv4/datagram.c index ffd57523331f..fefc5d855a66 100644 --- a/net/ipv4/datagram.c +++ b/net/ipv4/datagram.c @@ -71,7 +71,7 @@ int __ip4_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len reuseport_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; diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index 04e2034f2f8e..a4fbdbff14b3 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -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); } diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 5b019ba2b9d2..747752980983 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -303,7 +303,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; @@ -1523,7 +1523,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(). diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c index c4f2aeb31da3..6cab549cc421 100644 --- a/net/mac80211/scan.c +++ b/net/mac80211/scan.c @@ -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 = diff --git a/net/netfilter/nf_nat_core.c b/net/netfilter/nf_nat_core.c index 7981be526f26..57c7686ac485 100644 --- a/net/netfilter/nf_nat_core.c +++ b/net/netfilter/nf_nat_core.c @@ -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; } diff --git a/net/sched/sch_cake.c b/net/sched/sch_cake.c index a43a58a73d09..637ef1757931 100644 --- a/net/sched/sch_cake.c +++ b/net/sched/sch_cake.c @@ -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; diff --git a/net/sched/sch_sfb.c b/net/sched/sch_sfb.c index 2829455211f8..7eb70acb4d58 100644 --- a/net/sched/sch_sfb.c +++ b/net/sched/sch_sfb.c @@ -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)) { diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 1e354ba44960..83628c347744 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -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; -- 2.37.3 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 385DDC433F5 for ; Fri, 7 Oct 2022 18:02:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=/PpvkxReywV/E3xxRHv5Wpk1hzJ00J8mQU23ufAJHUg=; b=kgRrPRDh7IaF5P SKUN3XB6d0dCh38KULOmx1+Lo8t94eia8hL+cbLiviYrKD2+DCqMCbOrAWahg9JmzwLdYp7QlV0Pz E8CrMsaG+pAleKKsGmeJCs3Z68xzCEsAwTerd/rGhGezbjplLOdyrrdRU5G8uriW8ndGOxockZrUU 63yebzwvbNx29VZ1KxURP11uCdL/zsRkq+IyfxxFqPhXhuENhweq3qcbt5VLDRV+qIkc0FwREcqj7 YfkJsz9THs9LlMUB+Oz5bm7QWNaVOHOajIuyR3xbVvtjotLpb1Lzxlbx8M5Kopvgk19D7lrhPTfe7 ZWopGbgjE3HK7R4o038w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ogrfh-00A0fb-RU; Fri, 07 Oct 2022 18:02:06 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ogrfX-00A0Ue-5F; Fri, 07 Oct 2022 18:02:00 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 7377861A30; Fri, 7 Oct 2022 18:01:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3A591C433D6; Fri, 7 Oct 2022 18:01:48 +0000 (UTC) Authentication-Results: smtp.kernel.org; dkim=pass (1024-bit key) header.d=zx2c4.com header.i=@zx2c4.com header.b="gIpGeUR7" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zx2c4.com; s=20210105; t=1665165707; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=g2hIaC3XOM+KBWgkgbeW6UolDFW2WI2qSTHxKo7C8lY=; b=gIpGeUR7sH1a6vtvGheu2jhFVKZ2WKWz618uTZei7ExED40VBISjDiUH3Wks3xNjWIbn2L KrLDWZgyAe8MER/jEjQGBixBuPnt1RXSzdZ7XCst7BKQWWTcJ2raDjXjyod6bjNA706eue 3Th9FAhERXoQMCcsjJ7QVI7AGmu40G8= Received: by mail.zx2c4.com (ZX2C4 Mail Server) with ESMTPSA id 05093213 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Fri, 7 Oct 2022 18:01:46 +0000 (UTC) From: "Jason A. Donenfeld" To: linux-kernel@vger.kernel.org, patches@lists.linux.dev Cc: "Jason A. Donenfeld" , Andreas Noever , Andrew Morton , Andy Shevchenko , Borislav Petkov , Catalin Marinas , =?UTF-8?q?Christoph=20B=C3=B6hmwalder?= , Christoph Hellwig , Christophe Leroy , Daniel Borkmann , Dave Airlie , Dave Hansen , "David S . Miller" , Eric Dumazet , Florian Westphal , Greg Kroah-Hartman , "H . Peter Anvin" , Heiko Carstens , Helge Deller , Herbert Xu , Huacai Chen , Hugh Dickins , Jakub Kicinski , "James E . J . Bottomley" , Jan Kara , Jason Gunthorpe , Jens Axboe , Johannes Berg , Jonathan Corbet , Jozsef Kadlecsik , KP Singh , Kees Cook , Marco Elver , Mauro Carvalho Chehab , Michael Ellerman , Pablo Neira Ayuso , Paolo Abeni , Peter Zijlstra , Richard Weinberger , Russell King , Theodore Ts'o , Thomas Bogendoerfer , Thomas Gleixner , Thomas Graf , Ulf Hansson , Vignesh Raghavendra , WANG Xuerui , Will Deacon , Yury Norov , dri-devel@lists.freedesktop.org, kasan-dev@googlegroups.com, kernel-janitors@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-block@vger.kernel.org, linux-crypto@vger.kernel.org, linux-doc@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-media@vger.kernel.org, linux-mips@vger.kernel.org, linux-mm@kvack.org, linux-mmc@vger.kernel.org, linux-mtd@lists.infradead.org, linux-nvme@lists.infradead.org, linux-parisc@vger.kernel.org, linux-rdma@vger.kernel.org, linux-s390@vger.kernel.org, linux-um@lists.infradead.org, linux-usb@vger.kernel.org, linux-wireless@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, loongarch@lists.linux.dev, netdev@vger.kernel.org, sparclinux@vger.kernel.org, x86@kernel.org, =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= Subject: [PATCH v4 3/6] treewide: use get_random_{u8,u16}() when possible Date: Fri, 7 Oct 2022 12:01:04 -0600 Message-Id: <20221007180107.216067-4-Jason@zx2c4.com> In-Reply-To: <20221007180107.216067-1-Jason@zx2c4.com> References: <20221007180107.216067-1-Jason@zx2c4.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221007_110155_417016_1F2B7F7F X-CRM114-Status: GOOD ( 30.01 ) X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+linux-mtd=archiver.kernel.org@lists.infradead.org UmF0aGVyIHRoYW4gdHJ1bmNhdGUgYSAzMi1iaXQgdmFsdWUgdG8gYSAxNi1iaXQgdmFsdWUgb3Ig YW4gOC1iaXQgdmFsdWUsCnNpbXBseSB1c2UgdGhlIGdldF9yYW5kb21fe3U4LHUxNn0oKSBmdW5j dGlvbnMsIHdoaWNoIGFyZSBmYXN0ZXIgdGhhbgp3YXN0aW5nIHRoZSBhZGRpdGlvbmFsIGJ5dGVz IGZyb20gYSAzMi1iaXQgdmFsdWUuCgpSZXZpZXdlZC1ieTogS2VlcyBDb29rIDxrZWVzY29va0Bj aHJvbWl1bS5vcmc+CkFja2VkLWJ5OiBUb2tlIEjDuGlsYW5kLUrDuHJnZW5zZW4gPHRva2VAdG9r ZS5kaz4gIyBmb3Igc2NoX2Nha2UKU2lnbmVkLW9mZi1ieTogSmFzb24gQS4gRG9uZW5mZWxkIDxK YXNvbkB6eDJjNC5jb20+Ci0tLQogYXJjaC9hcm0va2VybmVsL3NpZ25hbC5jICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHwgMiArLQogYXJjaC9hcm02NC9rZXJuZWwvc3lzY2FsbC5j ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgMiArLQogYXJjaC9zMzkwL2tlcm5lbC9w cm9jZXNzLmMgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgMiArLQogYXJjaC9zcGFy Yy92ZHNvL3ZtYS5jICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgMiArLQog Y3J5cHRvL3Rlc3RtZ3IuYyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHwgOCArKysrLS0tLQogZHJpdmVycy9tZWRpYS9jb21tb24vdjRsMi10cGcvdjRsMi10cGctY29y ZS5jICAgICAgICAgICAgIHwgMiArLQogZHJpdmVycy9tZWRpYS90ZXN0LWRyaXZlcnMvdml2aWQv dml2aWQtcmFkaW8tcnguYyAgICAgICAgIHwgNCArKy0tCiAuLi4vbmV0L2V0aGVybmV0L2NoZWxz aW8vaW5saW5lX2NyeXB0by9jaHRscy9jaHRsc19jbS5jICAgfCAyICstCiBkcml2ZXJzL25ldC9o YW1yYWRpby9iYXljb21fZXBwLmMgICAgICAgICAgICAgICAgICAgICAgICAgfCAyICstCiBkcml2 ZXJzL25ldC9oYW1yYWRpby9oZGxjZHJ2LmMgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAy ICstCiBkcml2ZXJzL25ldC9oYW1yYWRpby95YW0uYyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgfCAyICstCiBkcml2ZXJzL25ldC93aXJlZ3VhcmQvc2VsZnRlc3QvYWxsb3dlZGlwcy5j ICAgICAgICAgICAgICAgfCA0ICsrLS0KIGRyaXZlcnMvbmV0L3dpcmVsZXNzL3N0L2N3MTIwMC93 c20uYyAgICAgICAgICAgICAgICAgICAgICB8IDIgKy0KIGRyaXZlcnMvc2NzaS9scGZjL2xwZmNf aGJhZGlzYy5jICAgICAgICAgICAgICAgICAgICAgICAgICB8IDYgKysrLS0tCiBsaWIvY21kbGlu ZV9rdW5pdC5jICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCA0ICsrLS0K IGxpYi90ZXN0X3ZtYWxsb2MuYyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICB8IDIgKy0KIG5ldC9kY2NwL2lwdjQuYyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICB8IDQgKystLQogbmV0L2lwdjQvZGF0YWdyYW0uYyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHwgMiArLQogbmV0L2lwdjQvaXBfb3V0cHV0LmMgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgMiArLQogbmV0L2lwdjQvdGNwX2lwdjQu YyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgNCArKy0tCiBuZXQvbWFj ODAyMTEvc2Nhbi5jICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAyICst CiBuZXQvbmV0ZmlsdGVyL25mX25hdF9jb3JlLmMgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgfCA0ICsrLS0KIG5ldC9zY2hlZC9zY2hfY2FrZS5jICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICB8IDYgKysrLS0tCiBuZXQvc2NoZWQvc2NoX3NmYi5jICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAyICstCiBuZXQvc2N0cC9zb2NrZXQuYyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAyICstCiAyNSBmaWxlcyBjaGFu Z2VkLCAzOCBpbnNlcnRpb25zKCspLCAzOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9hcmNo L2FybS9rZXJuZWwvc2lnbmFsLmMgYi9hcmNoL2FybS9rZXJuZWwvc2lnbmFsLmMKaW5kZXggZWEx MjhlMzJlOGNhLi5lMDdmMzU5MjU0YzMgMTAwNjQ0Ci0tLSBhL2FyY2gvYXJtL2tlcm5lbC9zaWdu YWwuYworKysgYi9hcmNoL2FybS9rZXJuZWwvc2lnbmFsLmMKQEAgLTY1NSw3ICs2NTUsNyBAQCBz dHJ1Y3QgcGFnZSAqZ2V0X3NpZ25hbF9wYWdlKHZvaWQpCiAJCSBQQUdFX1NJWkUgLyBzaXplb2Yo dTMyKSk7CiAKIAkvKiBHaXZlIHRoZSBzaWduYWwgcmV0dXJuIGNvZGUgc29tZSByYW5kb21uZXNz ICovCi0Jb2Zmc2V0ID0gMHgyMDAgKyAoZ2V0X3JhbmRvbV9pbnQoKSAmIDB4N2ZjKTsKKwlvZmZz ZXQgPSAweDIwMCArIChnZXRfcmFuZG9tX3UxNigpICYgMHg3ZmMpOwogCXNpZ25hbF9yZXR1cm5f b2Zmc2V0ID0gb2Zmc2V0OwogCiAJLyogQ29weSBzaWduYWwgcmV0dXJuIGhhbmRsZXJzIGludG8g dGhlIHBhZ2UgKi8KZGlmZiAtLWdpdCBhL2FyY2gvYXJtNjQva2VybmVsL3N5c2NhbGwuYyBiL2Fy Y2gvYXJtNjQva2VybmVsL3N5c2NhbGwuYwppbmRleCA3MzM0NTFmZTdlNDEuLmQ3MmU4ZjIzNDIy ZCAxMDA2NDQKLS0tIGEvYXJjaC9hcm02NC9rZXJuZWwvc3lzY2FsbC5jCisrKyBiL2FyY2gvYXJt NjQva2VybmVsL3N5c2NhbGwuYwpAQCAtNjcsNyArNjcsNyBAQCBzdGF0aWMgdm9pZCBpbnZva2Vf c3lzY2FsbChzdHJ1Y3QgcHRfcmVncyAqcmVncywgdW5zaWduZWQgaW50IHNjbm8sCiAJICoKIAkg KiBUaGUgcmVzdWx0aW5nIDUgYml0cyBvZiBlbnRyb3B5IGlzIHNlZW4gaW4gU1BbODo0XS4KIAkg Ki8KLQljaG9vc2VfcmFuZG9tX2tzdGFja19vZmZzZXQoZ2V0X3JhbmRvbV9pbnQoKSAmIDB4MUZG KTsKKwljaG9vc2VfcmFuZG9tX2tzdGFja19vZmZzZXQoZ2V0X3JhbmRvbV91MTYoKSAmIDB4MUZG KTsKIH0KIAogc3RhdGljIGlubGluZSBib29sIGhhc19zeXNjYWxsX3dvcmsodW5zaWduZWQgbG9u ZyBmbGFncykKZGlmZiAtLWdpdCBhL2FyY2gvczM5MC9rZXJuZWwvcHJvY2Vzcy5jIGIvYXJjaC9z MzkwL2tlcm5lbC9wcm9jZXNzLmMKaW5kZXggNWVjNzg1NTVkZDJlLi40MmFmNGIzYWEwMmIgMTAw NjQ0Ci0tLSBhL2FyY2gvczM5MC9rZXJuZWwvcHJvY2Vzcy5jCisrKyBiL2FyY2gvczM5MC9rZXJu ZWwvcHJvY2Vzcy5jCkBAIC0yMzAsNyArMjMwLDcgQEAgdW5zaWduZWQgbG9uZyBhcmNoX2FsaWdu X3N0YWNrKHVuc2lnbmVkIGxvbmcgc3ApCiAKIHN0YXRpYyBpbmxpbmUgdW5zaWduZWQgbG9uZyBi cmtfcm5kKHZvaWQpCiB7Ci0JcmV0dXJuIChnZXRfcmFuZG9tX2ludCgpICYgQlJLX1JORF9NQVNL KSA8PCBQQUdFX1NISUZUOworCXJldHVybiAoZ2V0X3JhbmRvbV91MTYoKSAmIEJSS19STkRfTUFT SykgPDwgUEFHRV9TSElGVDsKIH0KIAogdW5zaWduZWQgbG9uZyBhcmNoX3JhbmRvbWl6ZV9icmso c3RydWN0IG1tX3N0cnVjdCAqbW0pCmRpZmYgLS1naXQgYS9hcmNoL3NwYXJjL3Zkc28vdm1hLmMg Yi9hcmNoL3NwYXJjL3Zkc28vdm1hLmMKaW5kZXggY2MxOWUwOWIwZmExLi4wNGVlNzI2ODU5Y2Eg MTAwNjQ0Ci0tLSBhL2FyY2gvc3BhcmMvdmRzby92bWEuYworKysgYi9hcmNoL3NwYXJjL3Zkc28v dm1hLmMKQEAgLTM1NCw3ICszNTQsNyBAQCBzdGF0aWMgdW5zaWduZWQgbG9uZyB2ZHNvX2FkZHIo dW5zaWduZWQgbG9uZyBzdGFydCwgdW5zaWduZWQgaW50IGxlbikKIAl1bnNpZ25lZCBpbnQgb2Zm c2V0OwogCiAJLyogVGhpcyBsb3NlcyBzb21lIG1vcmUgYml0cyB0aGFuIGEgbW9kdWxvLCBidXQg aXMgY2hlYXBlciAqLwotCW9mZnNldCA9IGdldF9yYW5kb21faW50KCkgJiAoUFRSU19QRVJfUFRF IC0gMSk7CisJb2Zmc2V0ID0gZ2V0X3JhbmRvbV91MTYoKSAmIChQVFJTX1BFUl9QVEUgLSAxKTsK IAlyZXR1cm4gc3RhcnQgKyAob2Zmc2V0IDw8IFBBR0VfU0hJRlQpOwogfQogCmRpZmYgLS1naXQg YS9jcnlwdG8vdGVzdG1nci5jIGIvY3J5cHRvL3Rlc3RtZ3IuYwppbmRleCBiZTQ1MjE3YWNkZTQu Ljk4MWM2MzdmYTJlZCAxMDA2NDQKLS0tIGEvY3J5cHRvL3Rlc3RtZ3IuYworKysgYi9jcnlwdG8v dGVzdG1nci5jCkBAIC05MjcsNyArOTI3LDcgQEAgc3RhdGljIHZvaWQgZ2VuZXJhdGVfcmFuZG9t X2J5dGVzKHU4ICpidWYsIHNpemVfdCBjb3VudCkKIAkJCWIgPSAweGZmOwogCQkJYnJlYWs7CiAJ CWRlZmF1bHQ6Ci0JCQliID0gKHU4KXByYW5kb21fdTMyKCk7CisJCQliID0gZ2V0X3JhbmRvbV91 OCgpOwogCQkJYnJlYWs7CiAJCX0KIAkJbWVtc2V0KGJ1ZiwgYiwgY291bnQpOwpAQCAtOTM1LDgg KzkzNSw4IEBAIHN0YXRpYyB2b2lkIGdlbmVyYXRlX3JhbmRvbV9ieXRlcyh1OCAqYnVmLCBzaXpl X3QgY291bnQpCiAJCWJyZWFrOwogCWNhc2UgMjoKIAkJLyogQXNjZW5kaW5nIG9yIGRlc2NlbmRp bmcgYnl0ZXMsIHBsdXMgb3B0aW9uYWwgbXV0YXRpb25zICovCi0JCWluY3JlbWVudCA9ICh1OClw cmFuZG9tX3UzMigpOwotCQliID0gKHU4KXByYW5kb21fdTMyKCk7CisJCWluY3JlbWVudCA9IGdl dF9yYW5kb21fdTgoKTsKKwkJYiA9IGdldF9yYW5kb21fdTgoKTsKIAkJZm9yIChpID0gMDsgaSA8 IGNvdW50OyBpKyssIGIgKz0gaW5jcmVtZW50KQogCQkJYnVmW2ldID0gYjsKIAkJbXV0YXRlX2J1 ZmZlcihidWYsIGNvdW50KTsKQEAgLTk0NCw3ICs5NDQsNyBAQCBzdGF0aWMgdm9pZCBnZW5lcmF0 ZV9yYW5kb21fYnl0ZXModTggKmJ1Ziwgc2l6ZV90IGNvdW50KQogCWRlZmF1bHQ6CiAJCS8qIEZ1 bGx5IHJhbmRvbSBieXRlcyAqLwogCQlmb3IgKGkgPSAwOyBpIDwgY291bnQ7IGkrKykKLQkJCWJ1 ZltpXSA9ICh1OClwcmFuZG9tX3UzMigpOworCQkJYnVmW2ldID0gZ2V0X3JhbmRvbV91OCgpOwog CX0KIH0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9tZWRpYS9jb21tb24vdjRsMi10cGcvdjRsMi10 cGctY29yZS5jIGIvZHJpdmVycy9tZWRpYS9jb21tb24vdjRsMi10cGcvdjRsMi10cGctY29yZS5j CmluZGV4IDliN2JjZGNlNmU0NC4uMzAzZDAyYjFkNzFjIDEwMDY0NAotLS0gYS9kcml2ZXJzL21l ZGlhL2NvbW1vbi92NGwyLXRwZy92NGwyLXRwZy1jb3JlLmMKKysrIGIvZHJpdmVycy9tZWRpYS9j b21tb24vdjRsMi10cGcvdjRsMi10cGctY29yZS5jCkBAIC04NzAsNyArODcwLDcgQEAgc3RhdGlj IHZvaWQgcHJlY2FsY3VsYXRlX2NvbG9yKHN0cnVjdCB0cGdfZGF0YSAqdHBnLCBpbnQgaykKIAkJ ZyA9IHRwZ19jb2xvcnNbY29sXS5nOwogCQliID0gdHBnX2NvbG9yc1tjb2xdLmI7CiAJfSBlbHNl IGlmICh0cGctPnBhdHRlcm4gPT0gVFBHX1BBVF9OT0lTRSkgewotCQlyID0gZyA9IGIgPSBwcmFu ZG9tX3UzMl9tYXgoMjU2KTsKKwkJciA9IGcgPSBiID0gZ2V0X3JhbmRvbV91OCgpOwogCX0gZWxz ZSBpZiAoayA9PSBUUEdfQ09MT1JfUkFORE9NKSB7CiAJCXIgPSBnID0gYiA9IHRwZy0+cXVhbF9v ZmZzZXQgKyBwcmFuZG9tX3UzMl9tYXgoMTk2KTsKIAl9IGVsc2UgaWYgKGsgPj0gVFBHX0NPTE9S X1JBTVApIHsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvbWVkaWEvdGVzdC1kcml2ZXJzL3ZpdmlkL3Zp dmlkLXJhZGlvLXJ4LmMgYi9kcml2ZXJzL21lZGlhL3Rlc3QtZHJpdmVycy92aXZpZC92aXZpZC1y YWRpby1yeC5jCmluZGV4IDIzMmNhYjUwOGY0OC4uOGJkMDk1ODlmYjE1IDEwMDY0NAotLS0gYS9k cml2ZXJzL21lZGlhL3Rlc3QtZHJpdmVycy92aXZpZC92aXZpZC1yYWRpby1yeC5jCisrKyBiL2Ry aXZlcnMvbWVkaWEvdGVzdC1kcml2ZXJzL3ZpdmlkL3ZpdmlkLXJhZGlvLXJ4LmMKQEAgLTEwNCw4 ICsxMDQsOCBAQCBzc2l6ZV90IHZpdmlkX3JhZGlvX3J4X3JlYWQoc3RydWN0IGZpbGUgKmZpbGUs IGNoYXIgX191c2VyICpidWYsCiAJCQkJYnJlYWs7CiAJCQljYXNlIDI6CiAJCQkJcmRzLmJsb2Nr IHw9IFY0TDJfUkRTX0JMT0NLX0VSUk9SOwotCQkJCXJkcy5sc2IgPSBwcmFuZG9tX3UzMl9tYXgo MjU2KTsKLQkJCQlyZHMubXNiID0gcHJhbmRvbV91MzJfbWF4KDI1Nik7CisJCQkJcmRzLmxzYiA9 IGdldF9yYW5kb21fdTgoKTsKKwkJCQlyZHMubXNiID0gZ2V0X3JhbmRvbV91OCgpOwogCQkJCWJy ZWFrOwogCQkJY2FzZSAzOiAvKiBTa2lwIGJsb2NrIGFsdG9nZXRoZXIgKi8KIAkJCQlpZiAoaSkK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvbmV0L2V0aGVybmV0L2NoZWxzaW8vaW5saW5lX2NyeXB0by9j aHRscy9jaHRsc19jbS5jIGIvZHJpdmVycy9uZXQvZXRoZXJuZXQvY2hlbHNpby9pbmxpbmVfY3J5 cHRvL2NodGxzL2NodGxzX2NtLmMKaW5kZXggZGRmZTkyMDg1MjlhLi5hYzQ1MmEwMTExYTkgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvbmV0L2V0aGVybmV0L2NoZWxzaW8vaW5saW5lX2NyeXB0by9jaHRs cy9jaHRsc19jbS5jCisrKyBiL2RyaXZlcnMvbmV0L2V0aGVybmV0L2NoZWxzaW8vaW5saW5lX2Ny eXB0by9jaHRscy9jaHRsc19jbS5jCkBAIC0xNDY3LDcgKzE0NjcsNyBAQCBzdGF0aWMgdm9pZCBt YWtlX2VzdGFibGlzaGVkKHN0cnVjdCBzb2NrICpzaywgdTMyIHNuZF9pc24sIHVuc2lnbmVkIGlu dCBvcHQpCiAJdHAtPndyaXRlX3NlcSA9IHNuZF9pc247CiAJdHAtPnNuZF9ueHQgPSBzbmRfaXNu OwogCXRwLT5zbmRfdW5hID0gc25kX2lzbjsKLQlpbmV0X3NrKHNrKS0+aW5ldF9pZCA9IHByYW5k b21fdTMyKCk7CisJaW5ldF9zayhzayktPmluZXRfaWQgPSBnZXRfcmFuZG9tX3UxNigpOwogCWFz c2lnbl9yeG9wdChzaywgb3B0KTsKIAogCWlmICh0cC0+cmN2X3duZCA+IChSQ1ZfQlVGU0laX00g PDwgMTApKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9uZXQvaGFtcmFkaW8vYmF5Y29tX2VwcC5jIGIv ZHJpdmVycy9uZXQvaGFtcmFkaW8vYmF5Y29tX2VwcC5jCmluZGV4IDdkZjc4YTcyMWIwNC4uNzkx YjRhNTNkNjlmIDEwMDY0NAotLS0gYS9kcml2ZXJzL25ldC9oYW1yYWRpby9iYXljb21fZXBwLmMK KysrIGIvZHJpdmVycy9uZXQvaGFtcmFkaW8vYmF5Y29tX2VwcC5jCkBAIC00MzgsNyArNDM4LDcg QEAgc3RhdGljIGludCB0cmFuc21pdChzdHJ1Y3QgYmF5Y29tX3N0YXRlICpiYywgaW50IGNudCwg dW5zaWduZWQgY2hhciBzdGF0KQogCQkJaWYgKCgtLWJjLT5oZGxjdHguc2xvdGNudCkgPiAwKQog CQkJCXJldHVybiAwOwogCQkJYmMtPmhkbGN0eC5zbG90Y250ID0gYmMtPmNoX3BhcmFtcy5zbG90 dGltZTsKLQkJCWlmIChwcmFuZG9tX3UzMl9tYXgoMjU2KSA+IGJjLT5jaF9wYXJhbXMucHBlcnNp c3QpCisJCQlpZiAoZ2V0X3JhbmRvbV91OCgpID4gYmMtPmNoX3BhcmFtcy5wcGVyc2lzdCkKIAkJ CQlyZXR1cm4gMDsKIAkJfQogCX0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvbmV0L2hhbXJhZGlvL2hk bGNkcnYuYyBiL2RyaXZlcnMvbmV0L2hhbXJhZGlvL2hkbGNkcnYuYwppbmRleCAzNjBkMDQxYTYy YzQuLjZjNmYxMWQzZDBhYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9uZXQvaGFtcmFkaW8vaGRsY2Ry di5jCisrKyBiL2RyaXZlcnMvbmV0L2hhbXJhZGlvL2hkbGNkcnYuYwpAQCAtMzc3LDcgKzM3Nyw3 IEBAIHZvaWQgaGRsY2Rydl9hcmJpdHJhdGUoc3RydWN0IG5ldF9kZXZpY2UgKmRldiwgc3RydWN0 IGhkbGNkcnZfc3RhdGUgKnMpCiAJaWYgKCgtLXMtPmhkbGN0eC5zbG90Y250KSA+IDApCiAJCXJl dHVybjsKIAlzLT5oZGxjdHguc2xvdGNudCA9IHMtPmNoX3BhcmFtcy5zbG90dGltZTsKLQlpZiAo cHJhbmRvbV91MzJfbWF4KDI1NikgPiBzLT5jaF9wYXJhbXMucHBlcnNpc3QpCisJaWYgKGdldF9y YW5kb21fdTgoKSA+IHMtPmNoX3BhcmFtcy5wcGVyc2lzdCkKIAkJcmV0dXJuOwogCXN0YXJ0X3R4 KGRldiwgcyk7CiB9CmRpZmYgLS1naXQgYS9kcml2ZXJzL25ldC9oYW1yYWRpby95YW0uYyBiL2Ry aXZlcnMvbmV0L2hhbXJhZGlvL3lhbS5jCmluZGV4IDk3YTZjYzVjN2FlOC4uMmVkMmY4MzZmMDlh IDEwMDY0NAotLS0gYS9kcml2ZXJzL25ldC9oYW1yYWRpby95YW0uYworKysgYi9kcml2ZXJzL25l dC9oYW1yYWRpby95YW0uYwpAQCAtNjI2LDcgKzYyNiw3IEBAIHN0YXRpYyB2b2lkIHlhbV9hcmJp dHJhdGUoc3RydWN0IG5ldF9kZXZpY2UgKmRldikKIAl5cC0+c2xvdGNudCA9IHlwLT5zbG90IC8g MTA7CiAKIAkvKiBpcyByYW5kb20gPiBwZXJzaXN0ID8gKi8KLQlpZiAocHJhbmRvbV91MzJfbWF4 KDI1NikgPiB5cC0+cGVycykKKwlpZiAoZ2V0X3JhbmRvbV91OCgpID4geXAtPnBlcnMpCiAJCXJl dHVybjsKIAogCXlhbV9zdGFydF90eChkZXYsIHlwKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvbmV0 L3dpcmVndWFyZC9zZWxmdGVzdC9hbGxvd2VkaXBzLmMgYi9kcml2ZXJzL25ldC93aXJlZ3VhcmQv c2VsZnRlc3QvYWxsb3dlZGlwcy5jCmluZGV4IDQxZGIxMGY5YmU0OS4uZGQ4OTdjMDc0MGEyIDEw MDY0NAotLS0gYS9kcml2ZXJzL25ldC93aXJlZ3VhcmQvc2VsZnRlc3QvYWxsb3dlZGlwcy5jCisr KyBiL2RyaXZlcnMvbmV0L3dpcmVndWFyZC9zZWxmdGVzdC9hbGxvd2VkaXBzLmMKQEAgLTMxMCw3 ICszMTAsNyBAQCBzdGF0aWMgX19pbml0IGJvb2wgcmFuZG9taXplZF90ZXN0KHZvaWQpCiAJCQlm b3IgKGsgPSAwOyBrIDwgNDsgKytrKQogCQkJCW11dGF0ZWRba10gPSAobXV0YXRlZFtrXSAmIG11 dGF0ZV9tYXNrW2tdKSB8CiAJCQkJCSAgICAgKH5tdXRhdGVfbWFza1trXSAmCi0JCQkJCSAgICAg IHByYW5kb21fdTMyX21heCgyNTYpKTsKKwkJCQkJICAgICAgZ2V0X3JhbmRvbV91OCgpKTsKIAkJ CWNpZHIgPSBwcmFuZG9tX3UzMl9tYXgoMzIpICsgMTsKIAkJCXBlZXIgPSBwZWVyc1twcmFuZG9t X3UzMl9tYXgoTlVNX1BFRVJTKV07CiAJCQlpZiAod2dfYWxsb3dlZGlwc19pbnNlcnRfdjQoJnQs CkBAIC0zNTQsNyArMzU0LDcgQEAgc3RhdGljIF9faW5pdCBib29sIHJhbmRvbWl6ZWRfdGVzdCh2 b2lkKQogCQkJZm9yIChrID0gMDsgayA8IDQ7ICsraykKIAkJCQltdXRhdGVkW2tdID0gKG11dGF0 ZWRba10gJiBtdXRhdGVfbWFza1trXSkgfAogCQkJCQkgICAgICh+bXV0YXRlX21hc2tba10gJgot CQkJCQkgICAgICBwcmFuZG9tX3UzMl9tYXgoMjU2KSk7CisJCQkJCSAgICAgIGdldF9yYW5kb21f dTgoKSk7CiAJCQljaWRyID0gcHJhbmRvbV91MzJfbWF4KDEyOCkgKyAxOwogCQkJcGVlciA9IHBl ZXJzW3ByYW5kb21fdTMyX21heChOVU1fUEVFUlMpXTsKIAkJCWlmICh3Z19hbGxvd2VkaXBzX2lu c2VydF92NigmdCwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvbmV0L3dpcmVsZXNzL3N0L2N3MTIwMC93 c20uYyBiL2RyaXZlcnMvbmV0L3dpcmVsZXNzL3N0L2N3MTIwMC93c20uYwppbmRleCA1YTNlN2E2 MjY3MDIuLjRhOWU0YjVkMzU0NyAxMDA2NDQKLS0tIGEvZHJpdmVycy9uZXQvd2lyZWxlc3Mvc3Qv Y3cxMjAwL3dzbS5jCisrKyBiL2RyaXZlcnMvbmV0L3dpcmVsZXNzL3N0L2N3MTIwMC93c20uYwpA QCAtMTU5NCw3ICsxNTk0LDcgQEAgc3RhdGljIGludCBjdzEyMDBfZ2V0X3ByaW9fcXVldWUoc3Ry dWN0IGN3MTIwMF9jb21tb24gKnByaXYsCiAJCWVkY2EgPSAmcHJpdi0+ZWRjYS5wYXJhbXNbaV07 CiAJCXNjb3JlID0gKChlZGNhLT5haWZucyArIGVkY2EtPmN3bWluKSA8PCAxNikgKwogCQkJKChl ZGNhLT5jd21heCAtIGVkY2EtPmN3bWluKSAqCi0JCQkgKGdldF9yYW5kb21faW50KCkgJiAweEZG RkYpKTsKKwkJCSBnZXRfcmFuZG9tX3UxNigpKTsKIAkJaWYgKHNjb3JlIDwgYmVzdCAmJiAod2lu bmVyIDwgMCB8fCBpICE9IDMpKSB7CiAJCQliZXN0ID0gc2NvcmU7CiAJCQl3aW5uZXIgPSBpOwpk aWZmIC0tZ2l0IGEvZHJpdmVycy9zY3NpL2xwZmMvbHBmY19oYmFkaXNjLmMgYi9kcml2ZXJzL3Nj c2kvbHBmYy9scGZjX2hiYWRpc2MuYwppbmRleCAyNjQ1ZGVmNjEyZTYuLjI2ZDE3NzljYjU3MCAx MDA2NDQKLS0tIGEvZHJpdmVycy9zY3NpL2xwZmMvbHBmY19oYmFkaXNjLmMKKysrIGIvZHJpdmVy cy9zY3NpL2xwZmMvbHBmY19oYmFkaXNjLmMKQEAgLTIxNTAsOCArMjE1MCw4IEBAIGxwZmNfY2hl Y2tfcGVuZGluZ19mY29lX2V2ZW50KHN0cnVjdCBscGZjX2hiYSAqcGhiYSwgdWludDhfdCB1bnJl Z19mY2YpCiAgKiBUaGlzIGZ1bmN0aW9uIG1ha2VzIGFuIHJ1bm5pbmcgcmFuZG9tIHNlbGVjdGlv biBkZWNpc2lvbiBvbiBGQ0YgcmVjb3JkIHRvCiAgKiB1c2UgdGhyb3VnaCBhIHNlcXVlbmNlIG9m IEBmY2ZfY250IGVsaWdpYmxlIEZDRiByZWNvcmRzIHdpdGggZXF1YWwKICAqIHByb2JhYmlsaXR5 LiBUbyBwZXJmb3JtIGludGVnZXIgbWFudW5pcHVsYXRpb24gb2YgcmFuZG9tIG51bWJlcnMgd2l0 aAotICogc2l6ZSB1bml0MzJfdCwgdGhlIGxvd2VyIDE2IGJpdHMgb2YgdGhlIDMyLWJpdCByYW5k b20gbnVtYmVyIHJldHVybmVkCi0gKiBmcm9tIHByYW5kb21fdTMyKCkgYXJlIHRha2VuIGFzIHRo ZSByYW5kb20gcmFuZG9tIG51bWJlciBnZW5lcmF0ZWQuCisgKiBzaXplIHVuaXQzMl90LCBhIDE2 LWJpdCByYW5kb20gbnVtYmVyIHJldHVybmVkIGZyb20gZ2V0X3JhbmRvbV91MTYoKSBpcworICog dGFrZW4gYXMgdGhlIHJhbmRvbSByYW5kb20gbnVtYmVyIGdlbmVyYXRlZC4KICAqCiAgKiBSZXR1 cm5zIHRydWUgd2hlbiBvdXRjb21lIGlzIGZvciB0aGUgbmV3bHkgcmVhZCBGQ0YgcmVjb3JkIHNo b3VsZCBiZQogICogY2hvc2VuOyBvdGhlcndpc2UsIHJldHVybiBmYWxzZSB3aGVuIG91dGNvbWUg aXMgZm9yIGtlZXBpbmcgdGhlIHByZXZpb3VzbHkKQEAgLTIxNjMsNyArMjE2Myw3IEBAIGxwZmNf c2xpNF9uZXdfZmNmX3JhbmRvbV9zZWxlY3Qoc3RydWN0IGxwZmNfaGJhICpwaGJhLCB1aW50MzJf dCBmY2ZfY250KQogCXVpbnQzMl90IHJhbmRfbnVtOwogCiAJLyogR2V0IDE2LWJpdCB1bmlmb3Jt IHJhbmRvbSBudW1iZXIgKi8KLQlyYW5kX251bSA9IDB4RkZGRiAmIHByYW5kb21fdTMyKCk7CisJ cmFuZF9udW0gPSBnZXRfcmFuZG9tX3UxNigpOwogCiAJLyogRGVjaXNpb24gd2l0aCBwcm9iYWJp bGl0eSAxL2ZjZl9jbnQgKi8KIAlpZiAoKGZjZl9jbnQgKiByYW5kX251bSkgPCAweEZGRkYpCmRp ZmYgLS1naXQgYS9saWIvY21kbGluZV9rdW5pdC5jIGIvbGliL2NtZGxpbmVfa3VuaXQuYwppbmRl eCBhNzJhMmMxNjA2NmUuLmQ0NTcyZGJjOTE0NSAxMDA2NDQKLS0tIGEvbGliL2NtZGxpbmVfa3Vu aXQuYworKysgYi9saWIvY21kbGluZV9rdW5pdC5jCkBAIC03Niw3ICs3Niw3IEBAIHN0YXRpYyB2 b2lkIGNtZGxpbmVfdGVzdF9sZWFkX2ludChzdHJ1Y3Qga3VuaXQgKnRlc3QpCiAJCWludCByYyA9 IGNtZGxpbmVfdGVzdF92YWx1ZXNbaV07CiAJCWludCBvZmZzZXQ7CiAKLQkJc3ByaW50Zihpbiwg IiV1JXMiLCBnZXRfcmFuZG9tX2ludCgpICUgMjU2LCBzdHIpOworCQlzcHJpbnRmKGluLCAiJXUl cyIsIGdldF9yYW5kb21fdTgoKSwgc3RyKTsKIAkJLyogT25seSBmaXJzdCAnLScgYWZ0ZXIgdGhl IG51bWJlciB3aWxsIGFkdmFuY2UgdGhlIHBvaW50ZXIgKi8KIAkJb2Zmc2V0ID0gc3RybGVuKGlu KSAtIHN0cmxlbihzdHIpICsgISEocmMgPT0gMik7CiAJCWNtZGxpbmVfZG9fb25lX3Rlc3QodGVz dCwgaW4sIHJjLCBvZmZzZXQpOwpAQCAtOTQsNyArOTQsNyBAQCBzdGF0aWMgdm9pZCBjbWRsaW5l X3Rlc3RfdGFpbF9pbnQoc3RydWN0IGt1bml0ICp0ZXN0KQogCQlpbnQgcmMgPSBzdHJjbXAoc3Ry LCAiIikgPyAoc3RyY21wKHN0ciwgIi0iKSA/IDAgOiAxKSA6IDE7CiAJCWludCBvZmZzZXQ7CiAK LQkJc3ByaW50ZihpbiwgIiVzJXUiLCBzdHIsIGdldF9yYW5kb21faW50KCkgJSAyNTYpOworCQlz cHJpbnRmKGluLCAiJXMldSIsIHN0ciwgZ2V0X3JhbmRvbV91OCgpKTsKIAkJLyoKIAkJICogT25s eSBmaXJzdCBhbmQgbGVhZGluZyAnLScgbm90IGZvbGxvd2VkIGJ5IGludGVnZXIKIAkJICogd2ls bCBhZHZhbmNlIHRoZSBwb2ludGVyLgpkaWZmIC0tZ2l0IGEvbGliL3Rlc3Rfdm1hbGxvYy5jIGIv bGliL3Rlc3Rfdm1hbGxvYy5jCmluZGV4IDU2ZmZhYThkZDNmNi4uMDEzMWVkMmNkMWJkIDEwMDY0 NAotLS0gYS9saWIvdGVzdF92bWFsbG9jLmMKKysrIGIvbGliL3Rlc3Rfdm1hbGxvYy5jCkBAIC04 MCw3ICs4MCw3IEBAIHN0YXRpYyBpbnQgcmFuZG9tX3NpemVfYWxpZ25fYWxsb2NfdGVzdCh2b2lk KQogCWludCBpOwogCiAJZm9yIChpID0gMDsgaSA8IHRlc3RfbG9vcF9jb3VudDsgaSsrKSB7Ci0J CXJuZCA9IHByYW5kb21fdTMyKCk7CisJCXJuZCA9IGdldF9yYW5kb21fdTgoKTsKIAogCQkvKgog CQkgKiBNYXhpbXVtIDEwMjQgcGFnZXMsIGlmIFBBR0VfU0laRSBpcyA0MDk2LgpkaWZmIC0tZ2l0 IGEvbmV0L2RjY3AvaXB2NC5jIGIvbmV0L2RjY3AvaXB2NC5jCmluZGV4IGRhNmUzYjIwY2Q3NS4u MzAxNzk5ZTdmYTU2IDEwMDY0NAotLS0gYS9uZXQvZGNjcC9pcHY0LmMKKysrIGIvbmV0L2RjY3Av aXB2NC5jCkBAIC0xMjMsNyArMTIzLDcgQEAgaW50IGRjY3BfdjRfY29ubmVjdChzdHJ1Y3Qgc29j ayAqc2ssIHN0cnVjdCBzb2NrYWRkciAqdWFkZHIsIGludCBhZGRyX2xlbikKIAkJCQkJCSAgICBp bmV0LT5pbmV0X2RhZGRyLAogCQkJCQkJICAgIGluZXQtPmluZXRfc3BvcnQsCiAJCQkJCQkgICAg aW5ldC0+aW5ldF9kcG9ydCk7Ci0JaW5ldC0+aW5ldF9pZCA9IHByYW5kb21fdTMyKCk7CisJaW5l dC0+aW5ldF9pZCA9IGdldF9yYW5kb21fdTE2KCk7CiAKIAllcnIgPSBkY2NwX2Nvbm5lY3Qoc2sp OwogCXJ0ID0gTlVMTDsKQEAgLTQyMiw3ICs0MjIsNyBAQCBzdHJ1Y3Qgc29jayAqZGNjcF92NF9y ZXF1ZXN0X3JlY3Zfc29jayhjb25zdCBzdHJ1Y3Qgc29jayAqc2ssCiAJUkNVX0lOSVRfUE9JTlRF UihuZXdpbmV0LT5pbmV0X29wdCwgcmN1X2RlcmVmZXJlbmNlKGlyZXEtPmlyZXFfb3B0KSk7CiAJ bmV3aW5ldC0+bWNfaW5kZXggID0gaW5ldF9paWYoc2tiKTsKIAluZXdpbmV0LT5tY190dGwJICAg PSBpcF9oZHIoc2tiKS0+dHRsOwotCW5ld2luZXQtPmluZXRfaWQgICA9IHByYW5kb21fdTMyKCk7 CisJbmV3aW5ldC0+aW5ldF9pZCAgID0gZ2V0X3JhbmRvbV91MTYoKTsKIAogCWlmIChkc3QgPT0g TlVMTCAmJiAoZHN0ID0gaW5ldF9jc2tfcm91dGVfY2hpbGRfc29jayhzaywgbmV3c2ssIHJlcSkp ID09IE5VTEwpCiAJCWdvdG8gcHV0X2FuZF9leGl0OwpkaWZmIC0tZ2l0IGEvbmV0L2lwdjQvZGF0 YWdyYW0uYyBiL25ldC9pcHY0L2RhdGFncmFtLmMKaW5kZXggZmZkNTc1MjMzMzFmLi5mZWZjNWQ4 NTVhNjYgMTAwNjQ0Ci0tLSBhL25ldC9pcHY0L2RhdGFncmFtLmMKKysrIGIvbmV0L2lwdjQvZGF0 YWdyYW0uYwpAQCAtNzEsNyArNzEsNyBAQCBpbnQgX19pcDRfZGF0YWdyYW1fY29ubmVjdChzdHJ1 Y3Qgc29jayAqc2ssIHN0cnVjdCBzb2NrYWRkciAqdWFkZHIsIGludCBhZGRyX2xlbgogCXJldXNl cG9ydF9oYXNfY29ubnMoc2ssIHRydWUpOwogCXNrLT5za19zdGF0ZSA9IFRDUF9FU1RBQkxJU0hF RDsKIAlza19zZXRfdHhoYXNoKHNrKTsKLQlpbmV0LT5pbmV0X2lkID0gcHJhbmRvbV91MzIoKTsK KwlpbmV0LT5pbmV0X2lkID0gZ2V0X3JhbmRvbV91MTYoKTsKIAogCXNrX2RzdF9zZXQoc2ssICZy dC0+ZHN0KTsKIAllcnIgPSAwOwpkaWZmIC0tZ2l0IGEvbmV0L2lwdjQvaXBfb3V0cHV0LmMgYi9u ZXQvaXB2NC9pcF9vdXRwdXQuYwppbmRleCAwNGUyMDM0ZjJmOGUuLmE0ZmJkYmZmMTRiMyAxMDA2 NDQKLS0tIGEvbmV0L2lwdjQvaXBfb3V0cHV0LmMKKysrIGIvbmV0L2lwdjQvaXBfb3V0cHV0LmMK QEAgLTE3Miw3ICsxNzIsNyBAQCBpbnQgaXBfYnVpbGRfYW5kX3NlbmRfcGt0KHN0cnVjdCBza19i dWZmICpza2IsIGNvbnN0IHN0cnVjdCBzb2NrICpzaywKIAkJICogQXZvaWQgdXNpbmcgdGhlIGhh c2hlZCBJUCBpZGVudCBnZW5lcmF0b3IuCiAJCSAqLwogCQlpZiAoc2stPnNrX3Byb3RvY29sID09 IElQUFJPVE9fVENQKQotCQkJaXBoLT5pZCA9IChfX2ZvcmNlIF9fYmUxNilwcmFuZG9tX3UzMigp OworCQkJaXBoLT5pZCA9IChfX2ZvcmNlIF9fYmUxNilnZXRfcmFuZG9tX3UxNigpOwogCQllbHNl CiAJCQlfX2lwX3NlbGVjdF9pZGVudChuZXQsIGlwaCwgMSk7CiAJfQpkaWZmIC0tZ2l0IGEvbmV0 L2lwdjQvdGNwX2lwdjQuYyBiL25ldC9pcHY0L3RjcF9pcHY0LmMKaW5kZXggNWIwMTliYTJiOWQy Li43NDc3NTI5ODA5ODMgMTAwNjQ0Ci0tLSBhL25ldC9pcHY0L3RjcF9pcHY0LmMKKysrIGIvbmV0 L2lwdjQvdGNwX2lwdjQuYwpAQCAtMzAzLDcgKzMwMyw3IEBAIGludCB0Y3BfdjRfY29ubmVjdChz dHJ1Y3Qgc29jayAqc2ssIHN0cnVjdCBzb2NrYWRkciAqdWFkZHIsIGludCBhZGRyX2xlbikKIAkJ CQkJCSBpbmV0LT5pbmV0X2RhZGRyKTsKIAl9CiAKLQlpbmV0LT5pbmV0X2lkID0gcHJhbmRvbV91 MzIoKTsKKwlpbmV0LT5pbmV0X2lkID0gZ2V0X3JhbmRvbV91MTYoKTsKIAogCWlmICh0Y3BfZmFz dG9wZW5fZGVmZXJfY29ubmVjdChzaywgJmVycikpCiAJCXJldHVybiBlcnI7CkBAIC0xNTIzLDcg KzE1MjMsNyBAQCBzdHJ1Y3Qgc29jayAqdGNwX3Y0X3N5bl9yZWN2X3NvY2soY29uc3Qgc3RydWN0 IHNvY2sgKnNrLCBzdHJ1Y3Qgc2tfYnVmZiAqc2tiLAogCWluZXRfY3NrKG5ld3NrKS0+aWNza19l eHRfaGRyX2xlbiA9IDA7CiAJaWYgKGluZXRfb3B0KQogCQlpbmV0X2NzayhuZXdzayktPmljc2tf ZXh0X2hkcl9sZW4gPSBpbmV0X29wdC0+b3B0Lm9wdGxlbjsKLQluZXdpbmV0LT5pbmV0X2lkID0g cHJhbmRvbV91MzIoKTsKKwluZXdpbmV0LT5pbmV0X2lkID0gZ2V0X3JhbmRvbV91MTYoKTsKIAog CS8qIFNldCBUb1Mgb2YgdGhlIG5ldyBzb2NrZXQgYmFzZWQgdXBvbiB0aGUgdmFsdWUgb2YgaW5j b21pbmcgU1lOLgogCSAqIEVDVCBiaXRzIGFyZSBzZXQgbGF0ZXIgaW4gdGNwX2luaXRfdHJhbnNm ZXIoKS4KZGlmZiAtLWdpdCBhL25ldC9tYWM4MDIxMS9zY2FuLmMgYi9uZXQvbWFjODAyMTEvc2Nh bi5jCmluZGV4IGM0ZjJhZWIzMWRhMy4uNmNhYjU0OWNjNDIxIDEwMDY0NAotLS0gYS9uZXQvbWFj ODAyMTEvc2Nhbi5jCisrKyBiL25ldC9tYWM4MDIxMS9zY2FuLmMKQEAgLTY0MSw3ICs2NDEsNyBA QCBzdGF0aWMgdm9pZCBpZWVlODAyMTFfc2VuZF9zY2FuX3Byb2JlX3JlcShzdHJ1Y3QgaWVlZTgw MjExX3N1Yl9pZl9kYXRhICpzZGF0YSwKIAkJaWYgKGZsYWdzICYgSUVFRTgwMjExX1BST0JFX0ZM QUdfUkFORE9NX1NOKSB7CiAJCQlzdHJ1Y3QgaWVlZTgwMjExX2hkciAqaGRyID0gKHZvaWQgKilz a2ItPmRhdGE7CiAJCQlzdHJ1Y3QgaWVlZTgwMjExX3R4X2luZm8gKmluZm8gPSBJRUVFODAyMTFf U0tCX0NCKHNrYik7Ci0JCQl1MTYgc24gPSBnZXRfcmFuZG9tX3UzMigpOworCQkJdTE2IHNuID0g Z2V0X3JhbmRvbV91MTYoKTsKIAogCQkJaW5mby0+Y29udHJvbC5mbGFncyB8PSBJRUVFODAyMTFf VFhfQ1RSTF9OT19TRVFOTzsKIAkJCWhkci0+c2VxX2N0cmwgPQpkaWZmIC0tZ2l0IGEvbmV0L25l dGZpbHRlci9uZl9uYXRfY29yZS5jIGIvbmV0L25ldGZpbHRlci9uZl9uYXRfY29yZS5jCmluZGV4 IDc5ODFiZTUyNmYyNi4uNTdjNzY4NmFjNDg1IDEwMDY0NAotLS0gYS9uZXQvbmV0ZmlsdGVyL25m X25hdF9jb3JlLmMKKysrIGIvbmV0L25ldGZpbHRlci9uZl9uYXRfY29yZS5jCkBAIC00NjgsNyAr NDY4LDcgQEAgc3RhdGljIHZvaWQgbmZfbmF0X2w0cHJvdG9fdW5pcXVlX3R1cGxlKHN0cnVjdCBu Zl9jb25udHJhY2tfdHVwbGUgKnR1cGxlLAogCWlmIChyYW5nZS0+ZmxhZ3MgJiBORl9OQVRfUkFO R0VfUFJPVE9fT0ZGU0VUKQogCQlvZmYgPSAobnRvaHMoKmtleXB0cikgLSBudG9ocyhyYW5nZS0+ YmFzZV9wcm90by5hbGwpKTsKIAllbHNlCi0JCW9mZiA9IHByYW5kb21fdTMyKCk7CisJCW9mZiA9 IGdldF9yYW5kb21fdTE2KCk7CiAKIAlhdHRlbXB0cyA9IHJhbmdlX3NpemU7CiAJaWYgKGF0dGVt cHRzID4gbWF4X2F0dGVtcHRzKQpAQCAtNDkwLDcgKzQ5MCw3IEBAIHN0YXRpYyB2b2lkIG5mX25h dF9sNHByb3RvX3VuaXF1ZV90dXBsZShzdHJ1Y3QgbmZfY29ubnRyYWNrX3R1cGxlICp0dXBsZSwK IAlpZiAoYXR0ZW1wdHMgPj0gcmFuZ2Vfc2l6ZSB8fCBhdHRlbXB0cyA8IDE2KQogCQlyZXR1cm47 CiAJYXR0ZW1wdHMgLz0gMjsKLQlvZmYgPSBwcmFuZG9tX3UzMigpOworCW9mZiA9IGdldF9yYW5k b21fdTE2KCk7CiAJZ290byBhbm90aGVyX3JvdW5kOwogfQogCmRpZmYgLS1naXQgYS9uZXQvc2No ZWQvc2NoX2Nha2UuYyBiL25ldC9zY2hlZC9zY2hfY2FrZS5jCmluZGV4IGE0M2E1OGE3M2QwOS4u NjM3ZWYxNzU3OTMxIDEwMDY0NAotLS0gYS9uZXQvc2NoZWQvc2NoX2Nha2UuYworKysgYi9uZXQv c2NoZWQvc2NoX2Nha2UuYwpAQCAtMjA5MiwxMSArMjA5MiwxMSBAQCBzdGF0aWMgc3RydWN0IHNr X2J1ZmYgKmNha2VfZGVxdWV1ZShzdHJ1Y3QgUWRpc2MgKnNjaCkKIAogCQlXQVJOX09OKGhvc3Rf bG9hZCA+IENBS0VfUVVFVUVTKTsKIAotCQkvKiBUaGUgc2hpZnRlZCBwcmFuZG9tX3UzMigpIGlz IGEgd2F5IHRvIGFwcGx5IGRpdGhlcmluZyB0bwotCQkgKiBhdm9pZCBhY2N1bXVsYXRpbmcgcm91 bmRvZmYgZXJyb3JzCisJCS8qIFRoZSBnZXRfcmFuZG9tX3UxNigpIGlzIGEgd2F5IHRvIGFwcGx5 IGRpdGhlcmluZyB0byBhdm9pZAorCQkgKiBhY2N1bXVsYXRpbmcgcm91bmRvZmYgZXJyb3JzCiAJ CSAqLwogCQlmbG93LT5kZWZpY2l0ICs9IChiLT5mbG93X3F1YW50dW0gKiBxdWFudHVtX2Rpdlto b3N0X2xvYWRdICsKLQkJCQkgIChwcmFuZG9tX3UzMigpID4+IDE2KSkgPj4gMTY7CisJCQkJICBn ZXRfcmFuZG9tX3UxNigpKSA+PiAxNjsKIAkJbGlzdF9tb3ZlX3RhaWwoJmZsb3ctPmZsb3djaGFp biwgJmItPm9sZF9mbG93cyk7CiAKIAkJZ290byByZXRyeTsKZGlmZiAtLWdpdCBhL25ldC9zY2hl ZC9zY2hfc2ZiLmMgYi9uZXQvc2NoZWQvc2NoX3NmYi5jCmluZGV4IDI4Mjk0NTUyMTFmOC4uN2Vi NzBhY2I0ZDU4IDEwMDY0NAotLS0gYS9uZXQvc2NoZWQvc2NoX3NmYi5jCisrKyBiL25ldC9zY2hl ZC9zY2hfc2ZiLmMKQEAgLTM3OSw3ICszNzksNyBAQCBzdGF0aWMgaW50IHNmYl9lbnF1ZXVlKHN0 cnVjdCBza19idWZmICpza2IsIHN0cnVjdCBRZGlzYyAqc2NoLAogCQlnb3RvIGVucXVldWU7CiAJ fQogCi0JciA9IHByYW5kb21fdTMyKCkgJiBTRkJfTUFYX1BST0I7CisJciA9IGdldF9yYW5kb21f dTE2KCkgJiBTRkJfTUFYX1BST0I7CiAKIAlpZiAodW5saWtlbHkociA8IHBfbWluKSkgewogCQlp ZiAodW5saWtlbHkocF9taW4gPiBTRkJfTUFYX1BST0IgLyAyKSkgewpkaWZmIC0tZ2l0IGEvbmV0 L3NjdHAvc29ja2V0LmMgYi9uZXQvc2N0cC9zb2NrZXQuYwppbmRleCAxZTM1NGJhNDQ5NjAuLjgz NjI4YzM0Nzc0NCAxMDA2NDQKLS0tIGEvbmV0L3NjdHAvc29ja2V0LmMKKysrIGIvbmV0L3NjdHAv c29ja2V0LmMKQEAgLTk0NDgsNyArOTQ0OCw3IEBAIHZvaWQgc2N0cF9jb3B5X3NvY2soc3RydWN0 IHNvY2sgKm5ld3NrLCBzdHJ1Y3Qgc29jayAqc2ssCiAJbmV3aW5ldC0+aW5ldF9yY3Zfc2FkZHIg PSBpbmV0LT5pbmV0X3Jjdl9zYWRkcjsKIAluZXdpbmV0LT5pbmV0X2Rwb3J0ID0gaHRvbnMoYXNv Yy0+cGVlci5wb3J0KTsKIAluZXdpbmV0LT5wbXR1ZGlzYyA9IGluZXQtPnBtdHVkaXNjOwotCW5l d2luZXQtPmluZXRfaWQgPSBwcmFuZG9tX3UzMigpOworCW5ld2luZXQtPmluZXRfaWQgPSBnZXRf cmFuZG9tX3UxNigpOwogCiAJbmV3aW5ldC0+dWNfdHRsID0gaW5ldC0+dWNfdHRsOwogCW5ld2lu ZXQtPm1jX2xvb3AgPSAxOwotLSAKMi4zNy4zCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkxpbnV4IE1URCBkaXNjdXNzaW9uIG1haWxpbmcg bGlzdApodHRwOi8vbGlzdHMuaW5mcmFkZWFkLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xpbnV4LW10 ZC8K From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 982A1C433F5 for ; Sat, 8 Oct 2022 01:40:07 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4MkntG1pdVz2xHT for ; Sat, 8 Oct 2022 12:40:06 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=zx2c4.com header.i=@zx2c4.com header.a=rsa-sha256 header.s=20210105 header.b=gIpGeUR7; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=kernel.org (client-ip=139.178.84.217; helo=dfw.source.kernel.org; envelope-from=srs0=jvfi=2i=zx2c4.com=jason@kernel.org; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=zx2c4.com header.i=@zx2c4.com header.a=rsa-sha256 header.s=20210105 header.b=gIpGeUR7; dkim-atps=neutral Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4Mkbjd21Tkz2xfm for ; Sat, 8 Oct 2022 05:01:57 +1100 (AEDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 7377861A30; Fri, 7 Oct 2022 18:01:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3A591C433D6; Fri, 7 Oct 2022 18:01:48 +0000 (UTC) Authentication-Results: smtp.kernel.org; dkim=pass (1024-bit key) header.d=zx2c4.com header.i=@zx2c4.com header.b="gIpGeUR7" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zx2c4.com; s=20210105; t=1665165707; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=g2hIaC3XOM+KBWgkgbeW6UolDFW2WI2qSTHxKo7C8lY=; b=gIpGeUR7sH1a6vtvGheu2jhFVKZ2WKWz618uTZei7ExED40VBISjDiUH3Wks3xNjWIbn2L KrLDWZgyAe8MER/jEjQGBixBuPnt1RXSzdZ7XCst7BKQWWTcJ2raDjXjyod6bjNA706eue 3Th9FAhERXoQMCcsjJ7QVI7AGmu40G8= Received: by mail.zx2c4.com (ZX2C4 Mail Server) with ESMTPSA id 05093213 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Fri, 7 Oct 2022 18:01:46 +0000 (UTC) From: "Jason A. Donenfeld" To: linux-kernel@vger.kernel.org, patches@lists.linux.dev Subject: [PATCH v4 3/6] treewide: use get_random_{u8,u16}() when possible Date: Fri, 7 Oct 2022 12:01:04 -0600 Message-Id: <20221007180107.216067-4-Jason@zx2c4.com> In-Reply-To: <20221007180107.216067-1-Jason@zx2c4.com> References: <20221007180107.216067-1-Jason@zx2c4.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Mailman-Approved-At: Sat, 08 Oct 2022 12:28:34 +1100 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-wireless@vger.kernel.org, "Jason A. Donenfeld" , x86@kernel.org, Vignesh Raghavendra , linux-doc@vger.kernel.org, Peter Zijlstra , Catalin Marinas , Dave Hansen , kernel-janitors@vger.kernel.org, KP Singh , dri-devel@lists.freedesktop.org, linux-mm@kvack.org, Eric Dumazet , netdev@vger.kernel.org, linux-mtd@lists.infradead.org, kasan-dev@googlegroups.com, "H . Peter Anvin" , Andreas Noever , WANG Xuerui , Will Deacon , Christoph Hellwig , linux-s390@vger.kernel.org, sparclinux@vger.kernel.org, Mauro Carvalho Chehab , Herbert Xu , Daniel Borkmann , Jonathan Corbet , linux-rdma@vger.kernel.org, Helge Deller , Huacai Chen , Hugh Dickins , Russell King , Jozsef Kadlecsik , Jason Gunthorpe , Dave Airlie , Ulf Hansson , Paolo Abeni , "James E . J . Bottomley" , Pablo Neira Ayuso , linux-media@vger.kernel.org, Marco Elver , Kees Cook , Yury Norov , Heiko Carstens , =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= , linux-um@lists.infradead.org, linux-block@vger.kernel.org, Richard Weinberger , Borislav Petkov , linux-nvme@lists.infradead.org, loongarch@lists.linux.dev, Jakub Kicinski , Thomas Gleixner , Andy Shevchenko , Johannes Berg , linux-arm-kernel@lists.infradead.org, Jens Axboe , linux-mmc@vger.kernel.org, Thomas Bogendoerfer , Theodore Ts'o , linux-parisc@vger.kernel.org, Greg Kroah-Hartman , linux-usb@vger.kernel.org, Florian Westphal , linux-mips@vger.kernel.org, =?UTF-8?q?Christoph=20B=C3=B6hmwalder?= , linux-crypto@vger.kernel.org, Jan Kara , Thomas Graf , linux-fsdevel@vger.kernel.org, Andrew Morton , linuxppc-dev@lists.ozlabs.org, "David S . Miller" Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" 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. Reviewed-by: Kees Cook Acked-by: Toke Høiland-Jørgensen # for sch_cake Signed-off-by: Jason A. Donenfeld --- arch/arm/kernel/signal.c | 2 +- arch/arm64/kernel/syscall.c | 2 +- arch/s390/kernel/process.c | 2 +- arch/sparc/vdso/vma.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 ++-- lib/test_vmalloc.c | 2 +- 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/sched/sch_sfb.c | 2 +- net/sctp/socket.c | 2 +- 25 files changed, 38 insertions(+), 38 deletions(-) diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c index ea128e32e8ca..e07f359254c3 100644 --- a/arch/arm/kernel/signal.c +++ b/arch/arm/kernel/signal.c @@ -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 */ diff --git a/arch/arm64/kernel/syscall.c b/arch/arm64/kernel/syscall.c index 733451fe7e41..d72e8f23422d 100644 --- a/arch/arm64/kernel/syscall.c +++ b/arch/arm64/kernel/syscall.c @@ -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) diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c index 5ec78555dd2e..42af4b3aa02b 100644 --- a/arch/s390/kernel/process.c +++ b/arch/s390/kernel/process.c @@ -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) diff --git a/arch/sparc/vdso/vma.c b/arch/sparc/vdso/vma.c index cc19e09b0fa1..04ee726859ca 100644 --- a/arch/sparc/vdso/vma.c +++ b/arch/sparc/vdso/vma.c @@ -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 = get_random_u16() & (PTRS_PER_PTE - 1); return start + (offset << PAGE_SHIFT); } diff --git a/crypto/testmgr.c b/crypto/testmgr.c index be45217acde4..981c637fa2ed 100644 --- a/crypto/testmgr.c +++ b/crypto/testmgr.c @@ -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(); } } diff --git a/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c b/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c index 9b7bcdce6e44..303d02b1d71c 100644 --- a/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c +++ b/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c @@ -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) { diff --git a/drivers/media/test-drivers/vivid/vivid-radio-rx.c b/drivers/media/test-drivers/vivid/vivid-radio-rx.c index 232cab508f48..8bd09589fb15 100644 --- a/drivers/media/test-drivers/vivid/vivid-radio-rx.c +++ b/drivers/media/test-drivers/vivid/vivid-radio-rx.c @@ -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) diff --git a/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c b/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c index ddfe9208529a..ac452a0111a9 100644 --- a/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c +++ b/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c @@ -1467,7 +1467,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)) diff --git a/drivers/net/hamradio/baycom_epp.c b/drivers/net/hamradio/baycom_epp.c index 7df78a721b04..791b4a53d69f 100644 --- a/drivers/net/hamradio/baycom_epp.c +++ b/drivers/net/hamradio/baycom_epp.c @@ -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; } } diff --git a/drivers/net/hamradio/hdlcdrv.c b/drivers/net/hamradio/hdlcdrv.c index 360d041a62c4..6c6f11d3d0aa 100644 --- a/drivers/net/hamradio/hdlcdrv.c +++ b/drivers/net/hamradio/hdlcdrv.c @@ -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); } diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c index 97a6cc5c7ae8..2ed2f836f09a 100644 --- a/drivers/net/hamradio/yam.c +++ b/drivers/net/hamradio/yam.c @@ -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); diff --git a/drivers/net/wireguard/selftest/allowedips.c b/drivers/net/wireguard/selftest/allowedips.c index 41db10f9be49..dd897c0740a2 100644 --- a/drivers/net/wireguard/selftest/allowedips.c +++ b/drivers/net/wireguard/selftest/allowedips.c @@ -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, diff --git a/drivers/net/wireless/st/cw1200/wsm.c b/drivers/net/wireless/st/cw1200/wsm.c index 5a3e7a626702..4a9e4b5d3547 100644 --- a/drivers/net/wireless/st/cw1200/wsm.c +++ b/drivers/net/wireless/st/cw1200/wsm.c @@ -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; diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c index 2645def612e6..26d1779cb570 100644 --- a/drivers/scsi/lpfc/lpfc_hbadisc.c +++ b/drivers/scsi/lpfc/lpfc_hbadisc.c @@ -2150,8 +2150,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 @@ -2163,7 +2163,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) diff --git a/lib/cmdline_kunit.c b/lib/cmdline_kunit.c index a72a2c16066e..d4572dbc9145 100644 --- a/lib/cmdline_kunit.c +++ b/lib/cmdline_kunit.c @@ -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. diff --git a/lib/test_vmalloc.c b/lib/test_vmalloc.c index 56ffaa8dd3f6..0131ed2cd1bd 100644 --- a/lib/test_vmalloc.c +++ b/lib/test_vmalloc.c @@ -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. diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c index da6e3b20cd75..301799e7fa56 100644 --- a/net/dccp/ipv4.c +++ b/net/dccp/ipv4.c @@ -123,7 +123,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; @@ -422,7 +422,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; diff --git a/net/ipv4/datagram.c b/net/ipv4/datagram.c index ffd57523331f..fefc5d855a66 100644 --- a/net/ipv4/datagram.c +++ b/net/ipv4/datagram.c @@ -71,7 +71,7 @@ int __ip4_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len reuseport_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; diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index 04e2034f2f8e..a4fbdbff14b3 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -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); } diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 5b019ba2b9d2..747752980983 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -303,7 +303,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; @@ -1523,7 +1523,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(). diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c index c4f2aeb31da3..6cab549cc421 100644 --- a/net/mac80211/scan.c +++ b/net/mac80211/scan.c @@ -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 = diff --git a/net/netfilter/nf_nat_core.c b/net/netfilter/nf_nat_core.c index 7981be526f26..57c7686ac485 100644 --- a/net/netfilter/nf_nat_core.c +++ b/net/netfilter/nf_nat_core.c @@ -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; } diff --git a/net/sched/sch_cake.c b/net/sched/sch_cake.c index a43a58a73d09..637ef1757931 100644 --- a/net/sched/sch_cake.c +++ b/net/sched/sch_cake.c @@ -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; diff --git a/net/sched/sch_sfb.c b/net/sched/sch_sfb.c index 2829455211f8..7eb70acb4d58 100644 --- a/net/sched/sch_sfb.c +++ b/net/sched/sch_sfb.c @@ -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)) { diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 1e354ba44960..83628c347744 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -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; -- 2.37.3 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1E59CC433FE for ; Fri, 7 Oct 2022 18:02:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9DC5210E039; Fri, 7 Oct 2022 18:01:59 +0000 (UTC) Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0F96F10E039 for ; Fri, 7 Oct 2022 18:01:55 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 7377861A30; Fri, 7 Oct 2022 18:01:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3A591C433D6; Fri, 7 Oct 2022 18:01:48 +0000 (UTC) Authentication-Results: smtp.kernel.org; dkim=pass (1024-bit key) header.d=zx2c4.com header.i=@zx2c4.com header.b="gIpGeUR7" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zx2c4.com; s=20210105; t=1665165707; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=g2hIaC3XOM+KBWgkgbeW6UolDFW2WI2qSTHxKo7C8lY=; b=gIpGeUR7sH1a6vtvGheu2jhFVKZ2WKWz618uTZei7ExED40VBISjDiUH3Wks3xNjWIbn2L KrLDWZgyAe8MER/jEjQGBixBuPnt1RXSzdZ7XCst7BKQWWTcJ2raDjXjyod6bjNA706eue 3Th9FAhERXoQMCcsjJ7QVI7AGmu40G8= Received: by mail.zx2c4.com (ZX2C4 Mail Server) with ESMTPSA id 05093213 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Fri, 7 Oct 2022 18:01:46 +0000 (UTC) From: "Jason A. Donenfeld" To: linux-kernel@vger.kernel.org, patches@lists.linux.dev Subject: [PATCH v4 3/6] treewide: use get_random_{u8,u16}() when possible Date: Fri, 7 Oct 2022 12:01:04 -0600 Message-Id: <20221007180107.216067-4-Jason@zx2c4.com> In-Reply-To: <20221007180107.216067-1-Jason@zx2c4.com> References: <20221007180107.216067-1-Jason@zx2c4.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-wireless@vger.kernel.org, "Jason A. Donenfeld" , x86@kernel.org, Vignesh Raghavendra , linux-doc@vger.kernel.org, Peter Zijlstra , Catalin Marinas , Dave Hansen , kernel-janitors@vger.kernel.org, KP Singh , dri-devel@lists.freedesktop.org, linux-mm@kvack.org, Eric Dumazet , netdev@vger.kernel.org, linux-mtd@lists.infradead.org, kasan-dev@googlegroups.com, "H . Peter Anvin" , Andreas Noever , WANG Xuerui , Will Deacon , Christoph Hellwig , linux-s390@vger.kernel.org, sparclinux@vger.kernel.org, Mauro Carvalho Chehab , Herbert Xu , Daniel Borkmann , Jonathan Corbet , linux-rdma@vger.kernel.org, Michael Ellerman , Helge Deller , Huacai Chen , Hugh Dickins , Russell King , Christophe Leroy , Jozsef Kadlecsik , Jason Gunthorpe , Dave Airlie , Ulf Hansson , Paolo Abeni , "James E . J . Bottomley" , Pablo Neira Ayuso , linux-media@vger.kernel.org, Marco Elver , Kees Cook , Yury Norov , =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= , Heiko Carstens , linux-um@lists.infradead.org, linux-block@vger.kernel.org, Richard Weinberger , Borislav Petkov , linux-nvme@lists.infradead.org, loongarch@lists.linux.dev, Jakub Kicinski , Thomas Gleixner , Andy Shevchenko , Johannes Berg , linux-arm-kernel@lists.infradead.org, Jens Axboe , linux-mmc@vger.kernel.org, Thomas Bogendoerfer , Theodore Ts'o , linux-parisc@vger.kernel.org, Greg Kroah-Hartman , linux-usb@vger.kernel.org, Florian Westphal , linux-mips@vger.kernel.org, =?UTF-8?q?Christoph=20B=C3=B6hmwalder?= , linux-crypto@vger.kernel.org, Jan Kara , Thomas Graf , linux-fsdevel@vger.kernel.org, Andrew Morton , linuxppc-dev@lists.ozlabs.org, "David S . Miller" Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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. Reviewed-by: Kees Cook Acked-by: Toke Høiland-Jørgensen # for sch_cake Signed-off-by: Jason A. Donenfeld --- arch/arm/kernel/signal.c | 2 +- arch/arm64/kernel/syscall.c | 2 +- arch/s390/kernel/process.c | 2 +- arch/sparc/vdso/vma.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 ++-- lib/test_vmalloc.c | 2 +- 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/sched/sch_sfb.c | 2 +- net/sctp/socket.c | 2 +- 25 files changed, 38 insertions(+), 38 deletions(-) diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c index ea128e32e8ca..e07f359254c3 100644 --- a/arch/arm/kernel/signal.c +++ b/arch/arm/kernel/signal.c @@ -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 */ diff --git a/arch/arm64/kernel/syscall.c b/arch/arm64/kernel/syscall.c index 733451fe7e41..d72e8f23422d 100644 --- a/arch/arm64/kernel/syscall.c +++ b/arch/arm64/kernel/syscall.c @@ -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) diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c index 5ec78555dd2e..42af4b3aa02b 100644 --- a/arch/s390/kernel/process.c +++ b/arch/s390/kernel/process.c @@ -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) diff --git a/arch/sparc/vdso/vma.c b/arch/sparc/vdso/vma.c index cc19e09b0fa1..04ee726859ca 100644 --- a/arch/sparc/vdso/vma.c +++ b/arch/sparc/vdso/vma.c @@ -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 = get_random_u16() & (PTRS_PER_PTE - 1); return start + (offset << PAGE_SHIFT); } diff --git a/crypto/testmgr.c b/crypto/testmgr.c index be45217acde4..981c637fa2ed 100644 --- a/crypto/testmgr.c +++ b/crypto/testmgr.c @@ -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(); } } diff --git a/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c b/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c index 9b7bcdce6e44..303d02b1d71c 100644 --- a/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c +++ b/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c @@ -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) { diff --git a/drivers/media/test-drivers/vivid/vivid-radio-rx.c b/drivers/media/test-drivers/vivid/vivid-radio-rx.c index 232cab508f48..8bd09589fb15 100644 --- a/drivers/media/test-drivers/vivid/vivid-radio-rx.c +++ b/drivers/media/test-drivers/vivid/vivid-radio-rx.c @@ -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) diff --git a/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c b/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c index ddfe9208529a..ac452a0111a9 100644 --- a/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c +++ b/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c @@ -1467,7 +1467,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)) diff --git a/drivers/net/hamradio/baycom_epp.c b/drivers/net/hamradio/baycom_epp.c index 7df78a721b04..791b4a53d69f 100644 --- a/drivers/net/hamradio/baycom_epp.c +++ b/drivers/net/hamradio/baycom_epp.c @@ -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; } } diff --git a/drivers/net/hamradio/hdlcdrv.c b/drivers/net/hamradio/hdlcdrv.c index 360d041a62c4..6c6f11d3d0aa 100644 --- a/drivers/net/hamradio/hdlcdrv.c +++ b/drivers/net/hamradio/hdlcdrv.c @@ -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); } diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c index 97a6cc5c7ae8..2ed2f836f09a 100644 --- a/drivers/net/hamradio/yam.c +++ b/drivers/net/hamradio/yam.c @@ -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); diff --git a/drivers/net/wireguard/selftest/allowedips.c b/drivers/net/wireguard/selftest/allowedips.c index 41db10f9be49..dd897c0740a2 100644 --- a/drivers/net/wireguard/selftest/allowedips.c +++ b/drivers/net/wireguard/selftest/allowedips.c @@ -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, diff --git a/drivers/net/wireless/st/cw1200/wsm.c b/drivers/net/wireless/st/cw1200/wsm.c index 5a3e7a626702..4a9e4b5d3547 100644 --- a/drivers/net/wireless/st/cw1200/wsm.c +++ b/drivers/net/wireless/st/cw1200/wsm.c @@ -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; diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c index 2645def612e6..26d1779cb570 100644 --- a/drivers/scsi/lpfc/lpfc_hbadisc.c +++ b/drivers/scsi/lpfc/lpfc_hbadisc.c @@ -2150,8 +2150,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 @@ -2163,7 +2163,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) diff --git a/lib/cmdline_kunit.c b/lib/cmdline_kunit.c index a72a2c16066e..d4572dbc9145 100644 --- a/lib/cmdline_kunit.c +++ b/lib/cmdline_kunit.c @@ -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. diff --git a/lib/test_vmalloc.c b/lib/test_vmalloc.c index 56ffaa8dd3f6..0131ed2cd1bd 100644 --- a/lib/test_vmalloc.c +++ b/lib/test_vmalloc.c @@ -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. diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c index da6e3b20cd75..301799e7fa56 100644 --- a/net/dccp/ipv4.c +++ b/net/dccp/ipv4.c @@ -123,7 +123,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; @@ -422,7 +422,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; diff --git a/net/ipv4/datagram.c b/net/ipv4/datagram.c index ffd57523331f..fefc5d855a66 100644 --- a/net/ipv4/datagram.c +++ b/net/ipv4/datagram.c @@ -71,7 +71,7 @@ int __ip4_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len reuseport_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; diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index 04e2034f2f8e..a4fbdbff14b3 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -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); } diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 5b019ba2b9d2..747752980983 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -303,7 +303,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; @@ -1523,7 +1523,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(). diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c index c4f2aeb31da3..6cab549cc421 100644 --- a/net/mac80211/scan.c +++ b/net/mac80211/scan.c @@ -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 = diff --git a/net/netfilter/nf_nat_core.c b/net/netfilter/nf_nat_core.c index 7981be526f26..57c7686ac485 100644 --- a/net/netfilter/nf_nat_core.c +++ b/net/netfilter/nf_nat_core.c @@ -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; } diff --git a/net/sched/sch_cake.c b/net/sched/sch_cake.c index a43a58a73d09..637ef1757931 100644 --- a/net/sched/sch_cake.c +++ b/net/sched/sch_cake.c @@ -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; diff --git a/net/sched/sch_sfb.c b/net/sched/sch_sfb.c index 2829455211f8..7eb70acb4d58 100644 --- a/net/sched/sch_sfb.c +++ b/net/sched/sch_sfb.c @@ -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)) { diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 1e354ba44960..83628c347744 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -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; -- 2.37.3