[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH V2 07/21] vhost-vdpa: don't cleanup twice in vhost_vdpa_add()
From: |
Jason Wang |
Subject: |
[PATCH V2 07/21] vhost-vdpa: don't cleanup twice in vhost_vdpa_add() |
Date: |
Fri, 3 Sep 2021 17:10:17 +0800 |
The previous vhost_net_cleanup is sufficient for freeing, calling
vhost_vdpa_del() in this case will lead an extra round of free. Note
that this kind of "double free" is safe since vhost_dev_cleanup() zero
the whole structure.
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
net/vhost-vdpa.c | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
index 5c09cacd5a..3213e69d63 100644
--- a/net/vhost-vdpa.c
+++ b/net/vhost-vdpa.c
@@ -81,16 +81,6 @@ static int vhost_vdpa_net_check_device_id(struct vhost_net
*net)
return ret;
}
-static void vhost_vdpa_del(NetClientState *ncs)
-{
- VhostVDPAState *s;
- assert(ncs->info->type == NET_CLIENT_DRIVER_VHOST_VDPA);
- s = DO_UPCAST(VhostVDPAState, nc, ncs);
- if (s->vhost_net) {
- vhost_net_cleanup(s->vhost_net);
- }
-}
-
static int vhost_vdpa_add(NetClientState *ncs, void *be)
{
VhostNetOptions options;
@@ -121,7 +111,6 @@ err:
if (net) {
vhost_net_cleanup(net);
}
- vhost_vdpa_del(ncs);
return -1;
}
--
2.25.1
- [PATCH V2 00/21] vhost-vDPA multiqueue, Jason Wang, 2021/09/03
- [PATCH V2 01/21] vhost-vdpa: remove unused variable "acked_features", Jason Wang, 2021/09/03
- [PATCH V2 02/21] vhost-vdpa: correctly return err in vhost_vdpa_set_backend_cap(), Jason Wang, 2021/09/03
- [PATCH V2 03/21] vhost_net: remove the meaningless assignment in vhost_net_start_one(), Jason Wang, 2021/09/03
- [PATCH V2 04/21] vhost: use unsigned int for nvqs, Jason Wang, 2021/09/03
- [PATCH V2 05/21] vhost_net: do not assume nvqs is always 2, Jason Wang, 2021/09/03
- [PATCH V2 06/21] vhost-vdpa: remove the unnecessary check in vhost_vdpa_add(), Jason Wang, 2021/09/03
- [PATCH V2 07/21] vhost-vdpa: don't cleanup twice in vhost_vdpa_add(),
Jason Wang <=
- [PATCH V2 08/21] vhost-vdpa: fix leaking of vhost_net in vhost_vdpa_add(), Jason Wang, 2021/09/03
- [PATCH V2 09/21] vhost-vdpa: tweak the error label in vhost_vdpa_add(), Jason Wang, 2021/09/03
- [PATCH V2 10/21] vhost-vdpa: fix the wrong assertion in vhost_vdpa_init(), Jason Wang, 2021/09/03
- [PATCH V2 11/21] vhost-vdpa: remove the unncessary queue_index assignment, Jason Wang, 2021/09/03
- [PATCH V2 12/21] vhost-vdpa: open device fd in net_init_vhost_vdpa(), Jason Wang, 2021/09/03
- [PATCH V2 13/21] vhost-vdpa: classify one time request, Jason Wang, 2021/09/03
- [PATCH V2 14/21] vhost-vdpa: prepare for the multiqueue support, Jason Wang, 2021/09/03
- [PATCH V2 15/21] vhost-vdpa: let net_vhost_vdpa_init() returns NetClientState *, Jason Wang, 2021/09/03
- [PATCH V2 16/21] net: introduce control client, Jason Wang, 2021/09/03