Commit 64ed63d4 authored by Amos Kong's avatar Amos Kong Committed by Luis Henriques

virtio-rng: skip reading when we start to remove the device

commit f4981956 upstream.

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: default avatarAmos Kong <akong@redhat.com>
Reviewed-by: default avatarAmit Shah <amit.shah@redhat.com>
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent d024fb8a
...@@ -37,6 +37,7 @@ struct virtrng_info { ...@@ -37,6 +37,7 @@ struct virtrng_info {
char name[25]; char name[25];
int index; int index;
bool hwrng_register_done; bool hwrng_register_done;
bool hwrng_removed;
}; };
...@@ -69,6 +70,9 @@ static int virtio_read(struct hwrng *rng, void *buf, size_t size, bool wait) ...@@ -69,6 +70,9 @@ static int virtio_read(struct hwrng *rng, void *buf, size_t size, bool wait)
int ret; int ret;
struct virtrng_info *vi = (struct virtrng_info *)rng->priv; struct virtrng_info *vi = (struct virtrng_info *)rng->priv;
if (vi->hwrng_removed)
return -ENODEV;
if (!vi->busy) { if (!vi->busy) {
vi->busy = true; vi->busy = true;
init_completion(&vi->have_data); init_completion(&vi->have_data);
...@@ -137,6 +141,7 @@ static void remove_common(struct virtio_device *vdev) ...@@ -137,6 +141,7 @@ static void remove_common(struct virtio_device *vdev)
{ {
struct virtrng_info *vi = vdev->priv; struct virtrng_info *vi = vdev->priv;
vi->hwrng_removed = true;
vi->data_avail = 0; vi->data_avail = 0;
complete(&vi->have_data); complete(&vi->have_data);
vdev->config->reset(vdev); vdev->config->reset(vdev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment