This is a note to let you know that I've just added the patch titled
hwrng: virtio - ensure reads happen after successful probe
to the 3.15-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
hwrng-virtio-ensure-reads-happen-after-successful-probe.patch
and it can be found in the queue-3.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From e052dbf554610e2104c5a7518c4d8374bed701bb Mon Sep 17 00:00:00 2001
From: Amit Shah <[email protected]>
Date: Thu, 10 Jul 2014 15:42:35 +0530
Subject: hwrng: virtio - ensure reads happen after successful probe
From: Amit Shah <[email protected]>
commit e052dbf554610e2104c5a7518c4d8374bed701bb upstream.
The hwrng core asks for random data in the hwrng_register() call itself
from commit d9e7972619. This doesn't play well with virtio -- the
DRIVER_OK bit is only set by virtio core on a successful probe, and
we're not yet out of our probe routine when this call is made. This
causes the host to not acknowledge any requests we put in the virtqueue,
and the insmod or kernel boot process just waits for data to arrive from
the host, which never happens.
CC: Kees Cook <[email protected]>
CC: Jason Cooper <[email protected]>
CC: Herbert Xu <[email protected]>
Reviewed-by: Jason Cooper <[email protected]>
Signed-off-by: Amit Shah <[email protected]>
Signed-off-by: Herbert Xu <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/char/hw_random/core.c | 6 ++++++
drivers/char/hw_random/virtio-rng.c | 10 ++++++++++
2 files changed, 16 insertions(+)
--- a/drivers/char/hw_random/core.c
+++ b/drivers/char/hw_random/core.c
@@ -68,6 +68,12 @@ static void add_early_randomness(struct
unsigned char bytes[16];
int bytes_read;
+ /*
+ * Currently only virtio-rng cannot return data during device
+ * probe, and that's handled in virtio-rng.c itself. If there
+ * are more such devices, this call to rng_get_data can be
+ * made conditional here instead of doing it per-device.
+ */
bytes_read = rng_get_data(rng, bytes, sizeof(bytes), 1);
if (bytes_read > 0)
add_device_randomness(bytes, bytes_read);
--- a/drivers/char/hw_random/virtio-rng.c
+++ b/drivers/char/hw_random/virtio-rng.c
@@ -30,6 +30,8 @@ static unsigned int data_avail;
static DECLARE_COMPLETION(have_data);
static bool busy;
+static bool probe_done;
+
static void random_recv_done(struct virtqueue *vq)
{
/* We can get spurious callbacks, e.g. shared IRQs + virtio_pci. */
@@ -56,6 +58,13 @@ static int virtio_read(struct hwrng *rng
{
int ret;
+ /*
+ * Don't ask host for data till we're setup. This call can
+ * happen during hwrng_register(), after commit d9e7972619.
+ */
+ if (unlikely(!probe_done))
+ return 0;
+
if (!busy) {
busy = true;
init_completion(&have_data);
@@ -110,6 +119,7 @@ static int probe_common(struct virtio_de
return err;
}
+ probe_done = true;
return 0;
}
Patches currently in stable-queue which might be from [email protected] are
queue-3.15/hwrng-virtio-ensure-reads-happen-after-successful-probe.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
