[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 05/18] vhost-vdpa: don't cleanup twice in vhost_vdpa_add()
From: |
Jason Wang |
Subject: |
[PATCH 05/18] vhost-vdpa: don't cleanup twice in vhost_vdpa_add() |
Date: |
Mon, 21 Jun 2021 12:16:37 +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.
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 728e63ff54..f5689a7c32 100644
--- a/net/vhost-vdpa.c
+++ b/net/vhost-vdpa.c
@@ -82,16 +82,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;
@@ -122,7 +112,6 @@ err:
if (net) {
vhost_net_cleanup(net);
}
- vhost_vdpa_del(ncs);
return -1;
}
--
2.25.1
- [PATCH 02/18] vhost: use unsigned int for nvqs, (continued)
- [PATCH 02/18] vhost: use unsigned int for nvqs, Jason Wang, 2021/06/21
- [PATCH 03/18] vhost_net: do not assume nvqs is always 2, Jason Wang, 2021/06/21
- [PATCH 04/18] vhost-vdpa: remove the unnecessary check in vhost_vdpa_add(), Jason Wang, 2021/06/21
- [PATCH 05/18] vhost-vdpa: don't cleanup twice in vhost_vdpa_add(),
Jason Wang <=
- [PATCH 06/18] vhost-vdpa: fix leaking of vhost_net in vhost_vdpa_add(), Jason Wang, 2021/06/21
- Re: [PATCH 06/18] vhost-vdpa: fix leaking of vhost_net in vhost_vdpa_add(), Eli Cohen, 2021/06/24
- Re: [PATCH 06/18] vhost-vdpa: fix leaking of vhost_net in vhost_vdpa_add(), Jason Wang, 2021/06/24
[PATCH 07/18] vhost-vdpa: tweak the error label in vhost_vdpa_add(), Jason Wang, 2021/06/21