From: Eric Blake <eblake@redhat.com>
To: qemu-devel@nongnu.org
Cc: Jason Wang <jasowang@redhat.com>, armbru@redhat.com
Subject: [PATCH v2 1/7 for-5.2?] net: Fix memory leak on error
Date: Thu, 12 Nov 2020 19:13:34 -0600 [thread overview]
Message-ID: <20201113011340.463563-2-eblake@redhat.com> (raw)
In-Reply-To: <20201113011340.463563-1-eblake@redhat.com>
If qmp_query_rx_filter() encounters an error on a second iteration, it
leaks the memory from the first.
Fixes: 9083da1d4c
Signed-off-by: Eric Blake <eblake@redhat.com>
---
net/net.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/net/net.c b/net/net.c
index 794c652282cb..eb65e110871a 100644
--- a/net/net.c
+++ b/net/net.c
@@ -1213,6 +1213,7 @@ RxFilterInfoList *qmp_query_rx_filter(bool has_name, const char *name,
if (nc->info->type != NET_CLIENT_DRIVER_NIC) {
if (has_name) {
error_setg(errp, "net client(%s) isn't a NIC", name);
+ qapi_free_RxFilterInfoList(filter_list);
return NULL;
}
continue;
@@ -1238,6 +1239,7 @@ RxFilterInfoList *qmp_query_rx_filter(bool has_name, const char *name,
} else if (has_name) {
error_setg(errp, "net client(%s) doesn't support"
" rx-filter querying", name);
+ qapi_free_RxFilterInfoList(filter_list);
return NULL;
}
--
2.28.0
next prev parent reply other threads:[~2020-11-13 1:15 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-13 1:13 [PATCH v2 0/7] Common macros for QAPI list growth Eric Blake
2020-11-13 1:13 ` Eric Blake [this message]
2020-11-16 14:22 ` [PATCH v2 1/7 for-5.2?] net: Fix memory leak on error Markus Armbruster
2020-11-16 14:41 ` Eric Blake
2020-11-13 1:13 ` [PATCH v2 2/7] rocker: Revamp fp_port_get_info Eric Blake
2020-11-17 9:27 ` Markus Armbruster
2020-11-13 1:13 ` [PATCH v2 3/7] migration: Refactor migrate_cap_add Eric Blake
2020-11-17 9:45 ` Markus Armbruster
2020-11-13 1:13 ` [PATCH v2 4/7] qapi: Use QAPI_LIST_PREPEND() where possible Eric Blake
2020-11-17 10:20 ` Markus Armbruster
2020-11-17 11:45 ` Stefan Hajnoczi
2020-11-13 1:13 ` [PATCH v2 5/7] qapi: Introduce QAPI_LIST_APPEND Eric Blake
2020-11-17 12:51 ` Markus Armbruster
2020-11-18 0:41 ` Eric Blake
2020-11-18 6:21 ` Markus Armbruster
2020-11-13 1:13 ` [PATCH v2 6/7] qapi: Use QAPI_LIST_APPEND in trivial cases Eric Blake
2020-11-13 1:13 ` [PATCH v2 7/7] qapi: More complex uses of QAPI_LIST_APPEND Eric Blake
2020-11-13 19:39 ` Dr. David Alan Gilbert
2020-11-16 13:27 ` Eric Blake
2020-11-19 8:50 ` Markus Armbruster
2020-12-04 22:54 ` Eric Blake
2020-11-19 9:28 ` [PATCH v2 0/7] Common macros for QAPI list growth Markus Armbruster
2020-12-19 9:43 ` Markus Armbruster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201113011340.463563-2-eblake@redhat.com \
--to=eblake@redhat.com \
--cc=armbru@redhat.com \
--cc=jasowang@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).