summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmos Kong <akong@redhat.com>2014-09-11 22:21:53 +0930
committerRusty Russell <rusty@rustcorp.com.au>2014-09-11 22:28:38 +0930
commitf49819560f53b7f3a596a8ea2e6764dc86695b62 (patch)
tree1e964e9bcc767715a1236196b3611b5b81724b3d
parent3856e548372513665670ca5db60d9a74b970fe0d (diff)
downloadop-kernel-dev-f49819560f53b7f3a596a8ea2e6764dc86695b62.zip
op-kernel-dev-f49819560f53b7f3a596a8ea2e6764dc86695b62.tar.gz
virtio-rng: skip reading when we start to remove the device
Before we really unregister the hwrng device, reading will get stuck if the virtio device is reset. We should return error for reading when we start to remove the device. Signed-off-by: Amos Kong <akong@redhat.com> Reviewed-by: Amit Shah <amit.shah@redhat.com> Cc: stable@vger.kernel.org Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
-rw-r--r--drivers/char/hw_random/virtio-rng.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/char/hw_random/virtio-rng.c b/drivers/char/hw_random/virtio-rng.c
index 849b228..132c9cc 100644
--- a/drivers/char/hw_random/virtio-rng.c
+++ b/drivers/char/hw_random/virtio-rng.c
@@ -36,6 +36,7 @@ struct virtrng_info {
int index;
bool busy;
bool hwrng_register_done;
+ bool hwrng_removed;
};
@@ -68,6 +69,9 @@ static int virtio_read(struct hwrng *rng, void *buf, size_t size, bool wait)
int ret;
struct virtrng_info *vi = (struct virtrng_info *)rng->priv;
+ if (vi->hwrng_removed)
+ return -ENODEV;
+
if (!vi->busy) {
vi->busy = true;
init_completion(&vi->have_data);
@@ -137,6 +141,7 @@ static void remove_common(struct virtio_device *vdev)
{
struct virtrng_info *vi = vdev->priv;
+ vi->hwrng_removed = true;
vi->data_avail = 0;
complete(&vi->have_data);
vdev->config->reset(vdev);
OpenPOWER on IntegriCloud