Skip to content

Commit

Permalink
do not call vhost_net_cleanup() on running net from char user event
Browse files Browse the repository at this point in the history
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 <ddstreet@canonical.com>
Message-Id: <20190416184624.15397-3-dan.streetman@canonical.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
(cherry picked from commit 6ab79a2)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
  • Loading branch information
Dan Streetman authored and mdroth committed Jul 9, 2019
1 parent 8a5aaad commit f56e70e
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion net/vhost-user.c
Expand Up @@ -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);
Expand Down

0 comments on commit f56e70e

Please sign in to comment.