You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
49 lines
1.6 KiB
49 lines
1.6 KiB
2 years ago
|
From 3142102adb98f46518c0ac1773b0c48710c6bed6 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Si-Wei Liu <si-wei.liu@oracle.com>
|
||
|
|
Date: Fri, 6 May 2022 19:28:14 -0700
|
||
|
|
Subject: [PATCH 10/16] vhost-vdpa: fix improper cleanup in net_init_vhost_vdpa
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
RH-Author: Jason Wang <jasowang@redhat.com>
|
||
|
|
RH-MergeRequest: 98: Multiqueue fixes for vhost-vDPA
|
||
|
|
RH-Commit: [3/7] c83ff6c97d34cfae3c3447edde934b42a9ace75f (jasowang/qemu-kvm-cs)
|
||
|
|
RH-Bugzilla: 2070804
|
||
|
|
RH-Acked-by: Eugenio Pérez <eperezma@redhat.com>
|
||
|
|
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
||
|
|
RH-Acked-by: Cindy Lu <lulu@redhat.com>
|
||
|
|
|
||
|
|
... such that no memory leaks on dangling net clients in case of
|
||
|
|
error.
|
||
|
|
|
||
|
|
Signed-off-by: Si-Wei Liu <si-wei.liu@oracle.com>
|
||
|
|
Acked-by: Jason Wang <jasowang@redhat.com>
|
||
|
|
Message-Id: <1651890498-24478-4-git-send-email-si-wei.liu@oracle.com>
|
||
|
|
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
||
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
||
|
|
(cherry picked from commit 9bd055073e375c8a0d7ebce925e05d914d69fc7f)
|
||
|
|
Signed-off-by: Jason Wang <jasowang@redhat.com>
|
||
|
|
---
|
||
|
|
net/vhost-vdpa.c | 4 +++-
|
||
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
|
||
|
|
index 1e9fe47c03..df1e69ee72 100644
|
||
|
|
--- a/net/vhost-vdpa.c
|
||
|
|
+++ b/net/vhost-vdpa.c
|
||
|
|
@@ -306,7 +306,9 @@ int net_init_vhost_vdpa(const Netdev *netdev, const char *name,
|
||
|
|
|
||
|
|
err:
|
||
|
|
if (i) {
|
||
|
|
- qemu_del_net_client(ncs[0]);
|
||
|
|
+ for (i--; i >= 0; i--) {
|
||
|
|
+ qemu_del_net_client(ncs[i]);
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
qemu_close(vdpa_device_fd);
|
||
|
|
|
||
|
|
--
|
||
|
|
2.31.1
|
||
|
|
|