vhost_net: stop device during reset owner

jasowang · davem330 · commit 4cd879515d68 · 2018-01-29T12:26:20.000-05:00
We don't stop device before reset owner, this means we could try to serve any virtqueue kick before reset dev->worker. This will result a warn since the work was pending at llist during owner resetting. Fix this by stopping device during owner reset. Reported-by: syzbot+eb17c6162478cc50632c@syzkaller.appspotmail.com Fixes: 3a4d5c9 ("vhost_net: a kernel-level virtio server") Signed-off-by: Jason Wang <jasowang@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
@@ -1227,6 +1227,7 @@ static long vhost_net_reset_owner(struct vhost_net *n)
 	}
 	vhost_net_stop(n, &tx_sock, &rx_sock);
 	vhost_net_flush(n);
+	vhost_dev_stop(&n->dev);
 	vhost_dev_reset_owner(&n->dev, umem);
 	vhost_net_vq_reset(n);
 done:

Original file line number	Diff line number	Diff line change
`@@ -1227,6 +1227,7 @@ static long vhost_net_reset_owner(struct vhost_net *n)`
`1227`	`1227`	`}`
`1228`	`1228`	`vhost_net_stop(n, &tx_sock, &rx_sock);`
`1229`	`1229`	`vhost_net_flush(n);`
	`1230`	`+ vhost_dev_stop(&n->dev);`
`1230`	`1231`	`vhost_dev_reset_owner(&n->dev, umem);`
`1231`	`1232`	`vhost_net_vq_reset(n);`
`1232`	`1233`	`done:`