motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-28 04:21:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

vhost-net: always call vhost_dev_cleanup() on failure

Browse source 
vhost_dev_init(), calling vhost backend initialization, should be
cleaned up after failure too. Call vhost_dev_cleanup() in all failure
cases. First, it needs to zero-alloc the struct to avoid the initial
garbage.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Marc-André Lureau 2016-07-27 01:15:03 +04:00 • committed by Michael S. Tsirkin
parent e0547b59dc
commit f1a0365b68
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
hw/net/vhost_net.c
View file

@ -140,7 +140,7 @@ struct vhost_net *vhost_net_init(VhostNetOptions *options)
{ {
int r; int r;
bool backend_kernel = options->backend_type == VHOST_BACKEND_TYPE_KERNEL; bool backend_kernel = options->backend_type == VHOST_BACKEND_TYPE_KERNEL;
struct vhost_net *net = g_malloc(sizeof *net); struct vhost_net *net = g_new0(struct vhost_net, 1);
uint64_t features = 0; uint64_t features = 0;
if (!options->net_backend) { if (!options->net_backend) {
@ -185,7 +185,6 @@ struct vhost_net *vhost_net_init(VhostNetOptions *options)
fprintf(stderr, "vhost lacks feature mask %" PRIu64 fprintf(stderr, "vhost lacks feature mask %" PRIu64
" for backend\n", " for backend\n",
(uint64_t)(~net->dev.features & net->dev.backend_features)); (uint64_t)(~net->dev.features & net->dev.backend_features));
vhost_dev_cleanup(&net->dev);
goto fail; goto fail;
} }
} }
@ -197,7 +196,6 @@ struct vhost_net *vhost_net_init(VhostNetOptions *options)
fprintf(stderr, "vhost lacks feature mask %" PRIu64 fprintf(stderr, "vhost lacks feature mask %" PRIu64
" for backend\n", " for backend\n",
(uint64_t)(~net->dev.features & features)); (uint64_t)(~net->dev.features & features));
vhost_dev_cleanup(&net->dev);
goto fail; goto fail;
} }
} }
@ -205,7 +203,9 @@ struct vhost_net *vhost_net_init(VhostNetOptions *options)
vhost_net_ack_features(net, features); vhost_net_ack_features(net, features);
return net; return net;
fail: fail:
vhost_dev_cleanup(&net->dev);
g_free(net); g_free(net);
return NULL; return NULL;
} }