Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Bernd Edlinger <bernd.edlinger@hotmail.de>
To:     Theodore Ts'o <tytso@mit.edu>, Arnd Bergmann <arnd@arndb.de>,
        "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: [PATCH] random: Make /dev/random wait for crng_ready
Thread-Topic: [PATCH] random: Make /dev/random wait for crng_ready
Thread-Index: AQHUxNBhCboXjY4dck65d31dWPtwSA==
Date:   Fri, 15 Feb 2019 01:47:16 +0000
Message-ID: <VI1PR0702MB38408B595C818F1C3278873EE4600@VI1PR0702MB3840.eurprd07.prod.outlook.com>
Accept-Language: en-US, en-GB, de-DE
Content-Language: en-US
x-ms-exchange-messagesentrepresentingtype: 1
x-tmn:  [WdrXnHY+qOG2VdEkGn2uLEE0EqxIDfR6]
x-microsoft-original-message-id: <6919c2c2-af38-5e11-fa41-0044fe1f1490@hotmail.de>
x-ms-publictraffictype: Email
x-incomingheadercount: 60
x-eopattributedmessage: 0
x-microsoft-exchange-diagnostics: 1;VE1EUR01HT049;6:BjnvCUthfIiMlakkQQaUukakX6FO03wUf8CMe2hL8DIxCdV+o2xqG9/JpU2sCmyFSJY2amyOHNToHFlxnU7dFDUwqGr+rIBdEApdEXcq/nxWAgdBaQc5P/7bsolhwoMZi3UMTrcno6L56BjNPg9lUqNoOUvHPa6pe4p7dgkPo0x1c1aO/TTWKsmaPa2WiZeMibOl/cpAZnJhH09nfqccfG0FfwGdJuS4THdMf59StB5Al6wZ5LFrcH+lLlT8gq3+vB5B80t379/deGaTK2WPcXLC0UqmYGGeT3o4Q9v3cGxZPAhkmTQB8Qt/42pGqgjUnQIm2isfbjTWU6WXEy4ZloyphMVkyKcFKyDbUvkTxrJZ1Tx62P4CrcBZ3ecnrj1JkQaLYDWUJ6vK+kdSh4EEprkaPZ34xngwToAtiX3/d+DvYBlbAiKIsLNqxguFuZHaXcEggNjMgN+d7CZ+94qlew==;5:qU9XFZglZKxOzoRyN0sVI1a83j2wWAOwY1GTxy11D+/ct41/Qxc0RmBMGYM4MK3YcfhXyxhDUt7SwupfH0UQnPKFS1ZO4XS8Mq8hfoR5vt19Fra+sUqus7Wy9iM8Jvl+xsQhGaukTZEvYqX1kRuS4M9boezXTnFsYZACfbRcqmFsT7Q6t/2QQK6TdXdxxdSCYe1b2FLnHfkd17+lIhZ2hQ==;7:M/GVULfLQAlS9y7uv8DEaMJz/g04Dr7LgD6k1sPQJslQf/JtOuahXKVyoQHEnbde4eL0tf2+bnNXSkt8t1lXrShndXE4ndmwOE25K0mPYBTCwP8nLySQzq25XRR0c07VrzEYejPDR6cc9hamg7gAZQ==
x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(201702061078)(5061506573)(5061507331)(1603103135)(2017031320274)(2017031323274)(2017031324274)(2017031322404)(1603101475)(1601125500)(1701031045);SRVR:VE1EUR01HT049;
x-ms-traffictypediagnostic: VE1EUR01HT049:
x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(4566010)(82015058);SRVR:VE1EUR01HT049;BCL:0;PCL:0;RULEID:;SRVR:VE1EUR01HT049;
x-microsoft-antispam-message-info: oHSo8nv6dPGYFoHk4btzrN4cM4sueZAsiR5vSa7cyXVbYGAdtMa+QzysDFTjdwlK
Content-Type: text/plain; charset="Windows-1252"
Content-ID: <8006F73B11220E469A0EA2455C63CB54@eurprd07.prod.outlook.com>
Content-Transfer-Encoding: 8BIT
MIME-Version: 1.0
X-OriginatorOrg: outlook.com
X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: d4d70346-2c10-4f39-8c00-e767963926d9
X-MS-Exchange-CrossTenant-Network-Message-Id: fd9319ec-e794-4670-5743-08d692e783b9
X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: d4d70346-2c10-4f39-8c00-e767963926d9
X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Feb 2019 01:47:16.1684
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Internet
X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1EUR01HT049
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Reading from /dev/random may return data while the getrandom
syscall is still blocking.

Those bytes are not yet cryptographically secure.

Make read and select for reading on /dev/random wait until
the crng is fully initialized.

Signed-off-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
---
 drivers/char/random.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/char/random.c b/drivers/char/random.c
index 38c6d1a..ddbc0e2 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -720,7 +720,7 @@ static void credit_entropy_bits(struct entropy_store *r, int nbits)
 		}
 
 		/* should we wake readers? */
-		if (entropy_bits >= random_read_wakeup_bits &&
+		if (crng_ready() && entropy_bits >= random_read_wakeup_bits &&
 		    wq_has_sleeper(&random_read_wait)) {
 			wake_up_interruptible(&random_read_wait);
 			kill_fasync(&fasync, SIGIO, POLL_IN);
@@ -1851,7 +1851,9 @@ void rand_initialize_disk(struct gendisk *disk)
 
 	nbytes = min_t(size_t, nbytes, SEC_XFER_SIZE);
 	while (1) {
-		n = extract_entropy_user(&blocking_pool, buf, nbytes);
+		n = crng_ready()
+			?  extract_entropy_user(&blocking_pool, buf, nbytes)
+			: 0;
 		if (n < 0)
 			return n;
 		trace_random_read(n*8, (nbytes-n)*8,
@@ -1865,6 +1867,7 @@ void rand_initialize_disk(struct gendisk *disk)
 			return -EAGAIN;
 
 		wait_event_interruptible(random_read_wait,
+			crng_ready() &&
 			ENTROPY_BITS(&input_pool) >=
 			random_read_wakeup_bits);
 		if (signal_pending(current))
@@ -1909,7 +1912,8 @@ void rand_initialize_disk(struct gendisk *disk)
 	poll_wait(file, &random_read_wait, wait);
 	poll_wait(file, &random_write_wait, wait);
 	mask = 0;
-	if (ENTROPY_BITS(&input_pool) >= random_read_wakeup_bits)
+	if (crng_ready() &&
+		ENTROPY_BITS(&input_pool) >= random_read_wakeup_bits)
 		mask |= EPOLLIN | EPOLLRDNORM;
 	if (ENTROPY_BITS(&input_pool) < random_write_wakeup_bits)
 		mask |= EPOLLOUT | EPOLLWRNORM;
-- 
1.9.1