瀏覽代碼

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>
Amos Kong 11 年之前
父節點
當前提交
f49819560f
共有 1 個文件被更改,包括 5 次插入0 次删除
  1. 5 0
      drivers/char/hw_random/virtio-rng.c

+ 5 - 0
drivers/char/hw_random/virtio-rng.c

@@ -36,6 +36,7 @@ struct virtrng_info {
 	int index;
 	int index;
 	bool busy;
 	bool busy;
 	bool hwrng_register_done;
 	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;
 	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)
 {
 {
 	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);