From: "Jason A. Donenfeld" <Jason@zx2c4•com>
To: linux-kernel@vger•kernel.org
Cc: "Jason A. Donenfeld" <Jason@zx2c4•com>,
"Darrick J . Wong" <djwong@kernel•org>,
netdev@vger•kernel.org,
"Andreas Dilger" <adilger.kernel@dilger•ca>,
"Herbert Xu" <herbert@gondor•apana.org.au>,
"Richard Weinberger" <richard@nod•at>,
"Helge Deller" <deller@gmx•de>,
"Russell King" <linux@armlinux•org.uk>,
"Jason Gunthorpe" <jgg@nvidia•com>,
"Catalin Marinas" <catalin.marinas@arm•com>,
"Jakub Kicinski" <kuba@kernel•org>,
linux-media@vger•kernel.org, "Kees Cook" <keescook@chromium•org>,
"Heiko Carstens" <hca@linux•ibm.com>,
"Jani Nikula" <jani.nikula@linux•intel.com>,
linux-block@vger•kernel.org, "SeongJae Park" <sj@kernel•org>,
loongarch@lists•linux.dev, "Jaegeuk Kim" <jaegeuk@kernel•org>,
"Thomas Gleixner" <tglx@linutronix•de>,
linux-arm-kernel@lists•infradead.org,
"Thomas Bogendoerfer" <tsbogend@alpha•franken.de>,
"Theodore Ts'o" <tytso@mit•edu>,
linux-parisc@vger•kernel.org,
"Martin K . Petersen" <martin.petersen@oracle•com>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation•org>,
linux-mmc@vger•kernel.org, linux-mips@vger•kernel.org,
"Christoph Böhmwalder" <christoph.boehmwalder@linbit•com>,
linux-crypto@vger•kernel.org,
"Sakari Ailus" <sakari.ailus@linux•intel.com>,
linux-fsdevel@vger•kernel.org,
"Andrew Morton" <akpm@linux-foundation•org>,
linuxppc-dev@lists•ozlabs.org
Subject: [PATCH v1 4/5] treewide: use get_random_u32_{above,below}() instead of manual loop
Date: Fri, 21 Oct 2022 21:44:02 -0400 [thread overview]
Message-ID: <20221022014403.3881893-5-Jason@zx2c4.com> (raw)
In-Reply-To: <20221022014403.3881893-1-Jason@zx2c4.com>
These cases were done with this Coccinelle:
@@
expression E;
identifier I;
@@
- do {
...
- I = get_random_u32();
...
- } while (I > E);
+ I = get_random_u32_below(E + 1);
@@
expression E;
identifier I;
@@
- do {
...
- I = get_random_u32();
...
- } while (I >= E);
+ I = get_random_u32_below(E);
@@
expression E;
identifier I;
@@
- do {
...
- I = get_random_u32();
...
- } while (I < E);
+ I = get_random_u32_above(E - 1);
@@
expression E;
identifier I;
@@
- do {
...
- I = get_random_u32();
...
- } while (I <= E);
+ I = get_random_u32_above(E);
@@
identifier I;
@@
- do {
...
- I = get_random_u32();
...
- } while (!I);
+ I = get_random_u32_above(0);
@@
identifier I;
@@
- do {
...
- I = get_random_u32();
...
- } while (I == 0);
+ I = get_random_u32_above(0);
@@
expression E;
identifier I;
@@
- E + 1 + get_random_u32_below(U32_MAX - E)
+ get_random_u32_above(E)
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4•com>
---
fs/ext4/mmp.c | 8 +-------
lib/test_fprobe.c | 5 +----
lib/test_kprobes.c | 5 +----
net/ipv6/output_core.c | 8 +-------
net/vmw_vsock/af_vsock.c | 3 +--
5 files changed, 5 insertions(+), 24 deletions(-)
diff --git a/fs/ext4/mmp.c b/fs/ext4/mmp.c
index 588cb09c5291..4681fff6665f 100644
--- a/fs/ext4/mmp.c
+++ b/fs/ext4/mmp.c
@@ -262,13 +262,7 @@ void ext4_stop_mmpd(struct ext4_sb_info *sbi)
*/
static unsigned int mmp_new_seq(void)
{
- u32 new_seq;
-
- do {
- new_seq = get_random_u32();
- } while (new_seq > EXT4_MMP_SEQ_MAX);
-
- return new_seq;
+ return get_random_u32_below(EXT4_MMP_SEQ_MAX + 1);
}
/*
diff --git a/lib/test_fprobe.c b/lib/test_fprobe.c
index e0381b3ec410..1fb56cf5e5ce 100644
--- a/lib/test_fprobe.c
+++ b/lib/test_fprobe.c
@@ -144,10 +144,7 @@ static unsigned long get_ftrace_location(void *func)
static int fprobe_test_init(struct kunit *test)
{
- do {
- rand1 = get_random_u32();
- } while (rand1 <= div_factor);
-
+ rand1 = get_random_u32_above(div_factor);
target = fprobe_selftest_target;
target2 = fprobe_selftest_target2;
target_ip = get_ftrace_location(target);
diff --git a/lib/test_kprobes.c b/lib/test_kprobes.c
index eeb1d728d974..1c95e5719802 100644
--- a/lib/test_kprobes.c
+++ b/lib/test_kprobes.c
@@ -339,10 +339,7 @@ static int kprobes_test_init(struct kunit *test)
stacktrace_target = kprobe_stacktrace_target;
internal_target = kprobe_stacktrace_internal_target;
stacktrace_driver = kprobe_stacktrace_driver;
-
- do {
- rand1 = get_random_u32();
- } while (rand1 <= div_factor);
+ rand1 = get_random_u32_above(div_factor);
return 0;
}
diff --git a/net/ipv6/output_core.c b/net/ipv6/output_core.c
index 2685c3f15e9d..b5205311f372 100644
--- a/net/ipv6/output_core.c
+++ b/net/ipv6/output_core.c
@@ -15,13 +15,7 @@ static u32 __ipv6_select_ident(struct net *net,
const struct in6_addr *dst,
const struct in6_addr *src)
{
- u32 id;
-
- do {
- id = get_random_u32();
- } while (!id);
-
- return id;
+ return get_random_u32_above(0);
}
/* This function exists only for tap drivers that must support broken
diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
index f185f57c34e7..9cfed7fd8740 100644
--- a/net/vmw_vsock/af_vsock.c
+++ b/net/vmw_vsock/af_vsock.c
@@ -626,8 +626,7 @@ static int __vsock_bind_connectible(struct vsock_sock *vsk,
struct sockaddr_vm new_addr;
if (!port)
- port = LAST_RESERVED_PORT + 1 +
- get_random_u32_below(U32_MAX - LAST_RESERVED_PORT);
+ port = get_random_u32_above(LAST_RESERVED_PORT);
vsock_addr_init(&new_addr, addr->svm_cid, addr->svm_port);
--
2.38.1
next prev parent reply other threads:[~2022-10-22 1:48 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-22 1:43 [PATCH v1 0/5] convert tree to get_random_u32_{below,above,between}() Jason A. Donenfeld
2022-10-22 1:43 ` [PATCH v1 1/5] treewide: use get_random_u32_below() instead of deprecated function Jason A. Donenfeld
2022-10-22 2:25 ` Darrick J. Wong
2022-10-22 18:44 ` SeongJae Park
2022-10-22 1:44 ` [PATCH v1 2/5] prandom: remove prandom_u32_max() Jason A. Donenfeld
2022-10-22 1:44 ` [PATCH v1 3/5] random: add helpers for random numbers with given floor or range Jason A. Donenfeld
2022-10-22 1:44 ` Jason A. Donenfeld [this message]
2022-10-22 1:44 ` [PATCH v1 5/5] treewide: use get_random_u32_between() when possible Jason A. Donenfeld
2022-10-22 3:55 ` [PATCH v1 0/5] convert tree to get_random_u32_{below,above,between}() Jakub Kicinski
2022-10-22 4:23 ` Jason A. Donenfeld
2022-10-22 5:32 ` Jakub Kicinski
2022-10-22 5:47 ` Jason A. Donenfeld
2022-10-22 6:03 ` Jakub Kicinski
2022-10-23 21:07 ` Theodore Ts'o
2022-10-24 16:43 ` Jason A. Donenfeld
2022-10-22 10:21 ` Greg Kroah-Hartman
2022-10-24 16:37 ` Jason Gunthorpe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221022014403.3881893-5-Jason@zx2c4.com \
--to=jason@zx2c4$(echo .)com \
--cc=adilger.kernel@dilger$(echo .)ca \
--cc=akpm@linux-foundation$(echo .)org \
--cc=catalin.marinas@arm$(echo .)com \
--cc=christoph.boehmwalder@linbit$(echo .)com \
--cc=deller@gmx$(echo .)de \
--cc=djwong@kernel$(echo .)org \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=hca@linux$(echo .)ibm.com \
--cc=herbert@gondor$(echo .)apana.org.au \
--cc=jaegeuk@kernel$(echo .)org \
--cc=jani.nikula@linux$(echo .)intel.com \
--cc=jgg@nvidia$(echo .)com \
--cc=keescook@chromium$(echo .)org \
--cc=kuba@kernel$(echo .)org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-block@vger$(echo .)kernel.org \
--cc=linux-crypto@vger$(echo .)kernel.org \
--cc=linux-fsdevel@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-media@vger$(echo .)kernel.org \
--cc=linux-mips@vger$(echo .)kernel.org \
--cc=linux-mmc@vger$(echo .)kernel.org \
--cc=linux-parisc@vger$(echo .)kernel.org \
--cc=linux@armlinux$(echo .)org.uk \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=loongarch@lists$(echo .)linux.dev \
--cc=martin.petersen@oracle$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=richard@nod$(echo .)at \
--cc=sakari.ailus@linux$(echo .)intel.com \
--cc=sj@kernel$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
--cc=tsbogend@alpha$(echo .)franken.de \
--cc=tytso@mit$(echo .)edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox