mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
To: "Theodore Ts'o" <tytso@mit.edu>,
	Linux Crypto Mailing List <linux-crypto@vger.kernel.org>,
	LKML <linux-kernel@vger.kernel.org>,
	kernel-hardening@lists.openwall.com
Cc: "Jason A. Donenfeld" <Jason@zx2c4.com>
Subject: [PATCH RFC 2/3] random: add get_random_{bytes,u32,u64,int,long}_wait family
Date: Sat,  3 Jun 2017 04:32:03 +0200	[thread overview]
Message-ID: <20170603023204.30933-3-Jason@zx2c4.com> (raw)
In-Reply-To: <20170603023204.30933-1-Jason@zx2c4.com>

These functions are simple convience wrappers that call
wait_for_random_bytes before calling the respective get_random_*
function.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 include/linux/random.h | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/include/linux/random.h b/include/linux/random.h
index 20dd73418bd5..6a19da815ff1 100644
--- a/include/linux/random.h
+++ b/include/linux/random.h
@@ -58,6 +58,36 @@ static inline unsigned long get_random_long(void)
 #endif
 }
 
+/* Calls wait_for_random_bytes(is_interruptable, timeout) and then
+ * calls get_random_bytes(buf, nbytes). Returns the result of the
+ * call to wait_for_random_bytes.
+ */
+static inline int get_random_bytes_wait(void *buf, int nbytes,
+			bool is_interruptable, unsigned long timeout)
+{
+	int ret = wait_for_random_bytes(is_interruptable, timeout);
+	if (unlikely(ret))
+		return ret;
+	get_random_bytes(buf, nbytes);
+	return 0;
+}
+
+#define declare_get_random_var_wait(var) \
+	static inline int get_random_ ## var ## _wait(var *out, \
+			bool is_interruptable, unsigned long timeout) { \
+		int ret = wait_for_random_bytes(is_interruptable, timeout); \
+		if (unlikely(ret)) \
+			return ret; \
+		*out = get_random_ ## var(); \
+		return 0; \
+	}
+declare_get_random_var_wait(u32)
+declare_get_random_var_wait(u64)
+declare_get_random_var_wait(int)
+declare_get_random_var_wait(long)
+#undef declare_get_random_var
+
+
 unsigned long randomize_page(unsigned long start, unsigned long range);
 
 u32 prandom_u32(void);
-- 
2.13.0

  parent reply	other threads:[~2017-06-03  2:32 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-02 14:59 get_random_bytes returns bad randomness before seeding is complete Jason A. Donenfeld
2017-06-02 15:53 ` Jason A. Donenfeld
2017-06-02 16:48   ` Jason A. Donenfeld
2017-06-02 17:41   ` [kernel-hardening] " Daniel Micay
2017-06-02 17:46     ` Jason A. Donenfeld
2017-06-02 18:58     ` Kees Cook
2017-06-02 17:26 ` Theodore Ts'o
2017-06-02 17:44   ` Jason A. Donenfeld
2017-06-02 19:07     ` Theodore Ts'o
2017-06-02 23:58       ` Jason A. Donenfeld
2017-06-03  0:20         ` [kernel-hardening] " Sandy Harris
2017-06-03  2:32         ` [PATCH RFC 0/3] get_random_bytes seed blocking Jason A. Donenfeld
2017-06-03  2:32           ` [PATCH RFC 1/3] random: add synchronous API for the urandom pool Jason A. Donenfeld
2017-06-03  2:32           ` Jason A. Donenfeld [this message]
2017-06-03  2:32           ` [PATCH RFC 3/3] random: warn when kernel uses unseeded randomness Jason A. Donenfeld
2017-06-03  5:04         ` get_random_bytes returns bad randomness before seeding is complete Theodore Ts'o
2017-06-03 12:30           ` Jason A. Donenfeld
2017-06-03 21:45             ` Sandy Harris
2017-06-03 22:54               ` Jeffrey Walton
2017-06-03 23:55                 ` [kernel-hardening] " Daniel Micay
2017-06-04  5:55                 ` Stephan Müller
2017-06-04  5:48 ` Stephan Müller
2017-06-04  5:54   ` Jeffrey Walton
2017-06-04  6:23 ` Stephan Müller

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=20170603023204.30933-3-Jason@zx2c4.com \
    --to=jason@zx2c4.com \
    --cc=kernel-hardening@lists.openwall.com \
    --cc=linux-crypto@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=tytso@mit.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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

all inboxes | Powered by JetHome®