]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
hwrng: virtio - ensure reads happen after successful probe
authorAmit Shah <amit.shah@redhat.com>
Thu, 10 Jul 2014 10:12:35 +0000 (15:42 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 31 Jul 2014 19:44:09 +0000 (12:44 -0700)
commit0c688cb79b7adf6bbdfe795b438c5e33f3464589
treea665fbe03de62cd4abaa7f4c214153eddc060327
parentc0e67945a9ebd70889afe1d4c7793c5865873ffd
hwrng: virtio - ensure reads happen after successful probe

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 <keescook@chromium.org>
CC: Jason Cooper <jason@lakedaemon.net>
CC: Herbert Xu <herbert@gondor.apana.org.au>
Reviewed-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/char/hw_random/core.c
drivers/char/hw_random/virtio-rng.c