| Message ID | 1410329497-14349-3-git-send-email-akong@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On (Wed) 10 Sep 2014 [14:11:37], Amos Kong wrote: > 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> > Cc: stable@vger.kernel.org Reviewed-by: Amit Shah <amit.shah@redhat.com> Amit -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Amit Shah <amit.shah@redhat.com> writes: > On (Wed) 10 Sep 2014 [14:11:37], Amos Kong wrote: >> 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> >> Cc: stable@vger.kernel.org > > Reviewed-by: Amit Shah <amit.shah@redhat.com> Thanks, applied. They're sitting in my fixes branch. If there are no screams from linux-next, I'll push to Linus Monday. Cheers, Rusty. -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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);
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> Cc: stable@vger.kernel.org --- drivers/char/hw_random/virtio-rng.c | 5 +++++ 1 file changed, 5 insertions(+)