* [PATCH net v3] virtio_net: fix virtnet_open and virtnet_probe competing for try_fill_recv
@ 2016-05-31 3:52 Yunjian Wang
2016-05-31 21:22 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Yunjian Wang @ 2016-05-31 3:52 UTC (permalink / raw)
To: davem, jasowang, mst, rusty, netdev; +Cc: liuyongan, Yunjian Wang
In function virtnet_open() and virtnet_probe(), func try_fill_recv() may
be executed at the same time. VQ in virtqueue_add() has not been protected
well and BUG_ON will be triggered when virito_net.ko being removed.
Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
---
drivers/net/virtio_net.c | 18 ++----------------
1 file changed, 2 insertions(+), 16 deletions(-)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 49d84e5..e0638e5 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -1925,24 +1925,11 @@ static int virtnet_probe(struct virtio_device *vdev)
virtio_device_ready(vdev);
- /* Last of all, set up some receive buffers. */
- for (i = 0; i < vi->curr_queue_pairs; i++) {
- try_fill_recv(vi, &vi->rq[i], GFP_KERNEL);
-
- /* If we didn't even get one input buffer, we're useless. */
- if (vi->rq[i].vq->num_free ==
- virtqueue_get_vring_size(vi->rq[i].vq)) {
- free_unused_bufs(vi);
- err = -ENOMEM;
- goto free_recv_bufs;
- }
- }
-
vi->nb.notifier_call = &virtnet_cpu_callback;
err = register_hotcpu_notifier(&vi->nb);
if (err) {
pr_debug("virtio_net: registering cpu notifier failed\n");
- goto free_recv_bufs;
+ goto free_unregister_netdev;
}
/* Assume link up if device can't report link status,
@@ -1960,10 +1947,9 @@ static int virtnet_probe(struct virtio_device *vdev)
return 0;
-free_recv_bufs:
+free_unregister_netdev:
vi->vdev->config->reset(vdev);
- free_receive_bufs(vi);
unregister_netdev(dev);
free_vqs:
cancel_delayed_work_sync(&vi->refill);
--
1.7.12.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net v3] virtio_net: fix virtnet_open and virtnet_probe competing for try_fill_recv
2016-05-31 3:52 [PATCH net v3] virtio_net: fix virtnet_open and virtnet_probe competing for try_fill_recv Yunjian Wang
@ 2016-05-31 21:22 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2016-05-31 21:22 UTC (permalink / raw)
To: wangyunjian; +Cc: jasowang, mst, rusty, netdev, liuyongan
From: Yunjian Wang <wangyunjian@huawei.com>
Date: Tue, 31 May 2016 11:52:43 +0800
> In function virtnet_open() and virtnet_probe(), func try_fill_recv() may
> be executed at the same time. VQ in virtqueue_add() has not been protected
> well and BUG_ON will be triggered when virito_net.ko being removed.
>
> Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
> Acked-by: Jason Wang <jasowang@redhat.com>
> Acked-by: Michael S. Tsirkin <mst@redhat.com>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-05-31 21:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-05-31 3:52 [PATCH net v3] virtio_net: fix virtnet_open and virtnet_probe competing for try_fill_recv Yunjian Wang
2016-05-31 21:22 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.