From: Dan Streetman Date: Tue, 16 Apr 2019 18:46:24 +0000 (-0400) Subject: do not call vhost_net_cleanup() on running net from char user event X-Git-Tag: v3.1.1~57 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f56e70ee4f47a4232c99764f0508cd37b97ca425;p=users%2Fdwmw2%2Fqemu.git do not call vhost_net_cleanup() on running net from char user event Buglink: https://launchpad.net/bugs/1823458 Currently, a user CHR_EVENT_CLOSED event will cause net_vhost_user_event() to call vhost_user_cleanup(), which calls vhost_net_cleanup() for all its queues. However, vhost_net_cleanup() must never be called like this for fully-initialized nets; when other code later calls vhost_net_stop() - such as from virtio_net_vhost_status() - it will try to access the already-cleaned-up fields and fail with assertion errors or segfaults. The vhost_net_cleanup() will eventually be called from qemu_cleanup_net_client(). Signed-off-by: Dan Streetman Message-Id: <20190416184624.15397-3-dan.streetman@canonical.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin (cherry picked from commit 6ab79a20af3a7b3bf610ba9aebb446a9f0b05930) Signed-off-by: Michael Roth --- diff --git a/net/vhost-user.c b/net/vhost-user.c index a39f9c9974..afb5697acf 100644 --- a/net/vhost-user.c +++ b/net/vhost-user.c @@ -223,7 +223,6 @@ static void chr_closed_bh(void *opaque) s = DO_UPCAST(NetVhostUserState, nc, ncs[0]); qmp_set_link(name, false, &err); - vhost_user_stop(queues, ncs); qemu_chr_fe_set_handlers(&s->chr, NULL, NULL, net_vhost_user_event, NULL, opaque, NULL, true);