From: "Jason A. Donenfeld" <Jason@zx2c4•com>
To: linux-kernel@vger•kernel.org, patches@lists•linux.dev
Cc: "Jason A. Donenfeld" <Jason@zx2c4•com>,
"Andreas Noever" <andreas.noever@gmail•com>,
"Andrew Morton" <akpm@linux-foundation•org>,
"Andy Shevchenko" <andriy.shevchenko@linux•intel.com>,
"Borislav Petkov" <bp@alien8•de>,
"Catalin Marinas" <catalin.marinas@arm•com>,
"Christoph Böhmwalder" <christoph.boehmwalder@linbit•com>,
"Christoph Hellwig" <hch@lst•de>,
"Christophe Leroy" <christophe.leroy@csgroup•eu>,
"Daniel Borkmann" <daniel@iogearbox•net>,
"Dave Airlie" <airlied@redhat•com>,
"Dave Hansen" <dave.hansen@linux•intel.com>,
"David S . Miller" <davem@davemloft•net>,
"Eric Dumazet" <edumazet@google•com>,
"Florian Westphal" <fw@strlen•de>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation•org>,
"H . Peter Anvin" <hpa@zytor•com>,
"Heiko Carstens" <hca@linux•ibm.com>,
"Helge Deller" <deller@gmx•de>,
"Herbert Xu" <herbert@gondor•apana.org.au>,
"Huacai Chen" <chenhuacai@kernel•org>,
"Hugh Dickins" <hughd@google•com>,
"Jakub Kicinski" <kuba@kernel•org>,
"James E . J . Bottomley" <jejb@linux•ibm.com>,
"Jan Kara" <jack@suse•com>, "Jason Gunthorpe" <jgg@ziepe•ca>,
"Jens Axboe" <axboe@kernel•dk>,
"Johannes Berg" <johannes@sipsolutions•net>,
"Jonathan Corbet" <corbet@lwn•net>,
"Jozsef Kadlecsik" <kadlec@netfilter•org>,
"KP Singh" <kpsingh@kernel•org>,
"Kees Cook" <keescook@chromium•org>,
"Marco Elver" <elver@google•com>,
"Mauro Carvalho Chehab" <mchehab@kernel•org>,
"Michael Ellerman" <mpe@ellerman•id.au>,
"Pablo Neira Ayuso" <pablo@netfilter•org>,
"Paolo Abeni" <pabeni@redhat•com>,
"Peter Zijlstra" <peterz@infradead•org>,
"Richard Weinberger" <richard@nod•at>,
"Russell King" <linux@armlinux•org.uk>,
"Theodore Ts'o" <tytso@mit•edu>,
"Thomas Bogendoerfer" <tsbogend@alpha•franken.de>,
"Thomas Gleixner" <tglx@linutronix•de>,
"Thomas Graf" <tgraf@suug•ch>,
"Ulf Hansson" <ulf.hansson@linaro•org>,
"Vignesh Raghavendra" <vigneshr@ti•com>,
"WANG Xuerui" <kernel@xen0n•name>,
"Will Deacon" <will@kernel•org>,
"Yury Norov" <yury.norov@gmail•com>,
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
Subject: [PATCH v4 6/6] prandom: remove unused functions
Date: Fri, 7 Oct 2022 12:01:07 -0600 [thread overview]
Message-ID: <20221007180107.216067-7-Jason@zx2c4.com> (raw)
In-Reply-To: <20221007180107.216067-1-Jason@zx2c4.com>
With no callers left of prandom_u32() and prandom_bytes(), as well as
get_random_int(), remove these deprecated wrappers, in favor of
get_random_u32() and get_random_bytes().
Reviewed-by: Kees Cook <keescook@chromium•org>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4•com>
---
drivers/char/random.c | 11 +++++------
include/linux/prandom.h | 12 ------------
include/linux/random.h | 5 -----
3 files changed, 5 insertions(+), 23 deletions(-)
diff --git a/drivers/char/random.c b/drivers/char/random.c
index 01acf235f263..2fe28eeb2f38 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -97,7 +97,7 @@ MODULE_PARM_DESC(ratelimit_disable, "Disable random ratelimit suppression");
* Returns whether or not the input pool has been seeded and thus guaranteed
* to supply cryptographically secure random numbers. This applies to: the
* /dev/urandom device, the get_random_bytes function, and the get_random_{u8,
- * u16,u32,u64,int,long} family of functions.
+ * u16,u32,u64,long} family of functions.
*
* Returns: true if the input pool has been seeded.
* false if the input pool has not been seeded.
@@ -161,15 +161,14 @@ EXPORT_SYMBOL(wait_for_random_bytes);
* u16 get_random_u16()
* u32 get_random_u32()
* u64 get_random_u64()
- * unsigned int get_random_int()
* unsigned long get_random_long()
*
* These interfaces will return the requested number of random bytes
* into the given buffer or as a return value. This is equivalent to
- * a read from /dev/urandom. The u8, u16, u32, u64, int, and long
- * family of functions may be higher performance for one-off random
- * integers, because they do a bit of buffering and do not invoke
- * reseeding until the buffer is emptied.
+ * a read from /dev/urandom. The u8, u16, u32, u64, long family of
+ * functions may be higher performance for one-off random integers,
+ * because they do a bit of buffering and do not invoke reseeding
+ * until the buffer is emptied.
*
*********************************************************************/
diff --git a/include/linux/prandom.h b/include/linux/prandom.h
index 78db003bc290..e0a0759dd09c 100644
--- a/include/linux/prandom.h
+++ b/include/linux/prandom.h
@@ -12,18 +12,6 @@
#include <linux/percpu.h>
#include <linux/random.h>
-/* Deprecated: use get_random_u32 instead. */
-static inline u32 prandom_u32(void)
-{
- return get_random_u32();
-}
-
-/* Deprecated: use get_random_bytes instead. */
-static inline void prandom_bytes(void *buf, size_t nbytes)
-{
- return get_random_bytes(buf, nbytes);
-}
-
struct rnd_state {
__u32 s1, s2, s3, s4;
};
diff --git a/include/linux/random.h b/include/linux/random.h
index 08322f700cdc..147a5e0d0b8e 100644
--- a/include/linux/random.h
+++ b/include/linux/random.h
@@ -42,10 +42,6 @@ u8 get_random_u8(void);
u16 get_random_u16(void);
u32 get_random_u32(void);
u64 get_random_u64(void);
-static inline unsigned int get_random_int(void)
-{
- return get_random_u32();
-}
static inline unsigned long get_random_long(void)
{
#if BITS_PER_LONG == 64
@@ -100,7 +96,6 @@ declare_get_random_var_wait(u8, u8)
declare_get_random_var_wait(u16, u16)
declare_get_random_var_wait(u32, u32)
declare_get_random_var_wait(u64, u32)
-declare_get_random_var_wait(int, unsigned int)
declare_get_random_var_wait(long, unsigned long)
#undef declare_get_random_var
--
2.37.3
prev parent reply other threads:[~2022-10-07 18:04 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-07 18:01 [PATCH v4 0/6] treewide cleanup of random integer usage Jason A. Donenfeld
2022-10-07 18:01 ` [PATCH v4 1/6] treewide: use prandom_u32_max() when possible, mechanically Jason A. Donenfeld
2022-10-07 21:14 ` Darrick J. Wong
2022-10-07 18:01 ` [PATCH v4 2/6] treewide: use prandom_u32_max() when possible Jason A. Donenfeld
2022-10-07 21:17 ` Darrick J. Wong
2022-10-08 1:28 ` Jason A. Donenfeld
2022-10-07 22:47 ` Kees Cook
2022-10-08 2:21 ` Jason A. Donenfeld
2022-10-08 3:21 ` Jason A. Donenfeld
2022-10-08 22:08 ` David Laight
2022-10-08 22:19 ` Jason A. Donenfeld
2022-10-07 18:01 ` [PATCH v4 3/6] treewide: use get_random_{u8,u16}() " Jason A. Donenfeld
2022-10-07 18:01 ` [PATCH v4 4/6] treewide: use get_random_u32() " Jason A. Donenfeld
2022-10-07 20:34 ` Rolf Eike Beer
2022-10-08 1:40 ` Jason A. Donenfeld
2022-10-07 21:19 ` Darrick J. Wong
2022-10-08 22:18 ` David Laight
2022-10-08 22:37 ` Jason A. Donenfeld
2022-10-09 0:26 ` Jason A. Donenfeld
2022-10-07 18:01 ` [PATCH v4 5/6] treewide: use get_random_bytes " Jason A. Donenfeld
2022-10-07 18:01 ` Jason A. Donenfeld [this message]
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=20221007180107.216067-7-Jason@zx2c4.com \
--to=jason@zx2c4$(echo .)com \
--cc=airlied@redhat$(echo .)com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=andreas.noever@gmail$(echo .)com \
--cc=andriy.shevchenko@linux$(echo .)intel.com \
--cc=axboe@kernel$(echo .)dk \
--cc=bp@alien8$(echo .)de \
--cc=catalin.marinas@arm$(echo .)com \
--cc=chenhuacai@kernel$(echo .)org \
--cc=christoph.boehmwalder@linbit$(echo .)com \
--cc=christophe.leroy@csgroup$(echo .)eu \
--cc=corbet@lwn$(echo .)net \
--cc=daniel@iogearbox$(echo .)net \
--cc=dave.hansen@linux$(echo .)intel.com \
--cc=davem@davemloft$(echo .)net \
--cc=deller@gmx$(echo .)de \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=edumazet@google$(echo .)com \
--cc=elver@google$(echo .)com \
--cc=fw@strlen$(echo .)de \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=hca@linux$(echo .)ibm.com \
--cc=hch@lst$(echo .)de \
--cc=herbert@gondor$(echo .)apana.org.au \
--cc=hpa@zytor$(echo .)com \
--cc=hughd@google$(echo .)com \
--cc=jack@suse$(echo .)com \
--cc=jejb@linux$(echo .)ibm.com \
--cc=jgg@ziepe$(echo .)ca \
--cc=johannes@sipsolutions$(echo .)net \
--cc=kadlec@netfilter$(echo .)org \
--cc=kasan-dev@googlegroups$(echo .)com \
--cc=keescook@chromium$(echo .)org \
--cc=kernel-janitors@vger$(echo .)kernel.org \
--cc=kernel@xen0n$(echo .)name \
--cc=kpsingh@kernel$(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-doc@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-mm@kvack$(echo .)org \
--cc=linux-mmc@vger$(echo .)kernel.org \
--cc=linux-mtd@lists$(echo .)infradead.org \
--cc=linux-nvme@lists$(echo .)infradead.org \
--cc=linux-parisc@vger$(echo .)kernel.org \
--cc=linux-rdma@vger$(echo .)kernel.org \
--cc=linux-s390@vger$(echo .)kernel.org \
--cc=linux-um@lists$(echo .)infradead.org \
--cc=linux-usb@vger$(echo .)kernel.org \
--cc=linux-wireless@vger$(echo .)kernel.org \
--cc=linux@armlinux$(echo .)org.uk \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=loongarch@lists$(echo .)linux.dev \
--cc=mchehab@kernel$(echo .)org \
--cc=mpe@ellerman$(echo .)id.au \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pabeni@redhat$(echo .)com \
--cc=pablo@netfilter$(echo .)org \
--cc=patches@lists$(echo .)linux.dev \
--cc=peterz@infradead$(echo .)org \
--cc=richard@nod$(echo .)at \
--cc=sparclinux@vger$(echo .)kernel.org \
--cc=tglx@linutronix$(echo .)de \
--cc=tgraf@suug$(echo .)ch \
--cc=tsbogend@alpha$(echo .)franken.de \
--cc=tytso@mit$(echo .)edu \
--cc=ulf.hansson@linaro$(echo .)org \
--cc=vigneshr@ti$(echo .)com \
--cc=will@kernel$(echo .)org \
--cc=x86@kernel$(echo .)org \
--cc=yury.norov@gmail$(echo .)com \
/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