From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44261) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xrm9B-0003tw-7t for qemu-devel@nongnu.org; Fri, 21 Nov 2014 06:13:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xrm95-0005g4-PX for qemu-devel@nongnu.org; Fri, 21 Nov 2014 06:13:05 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59397) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xrm95-0005fa-IX for qemu-devel@nongnu.org; Fri, 21 Nov 2014 06:12:59 -0500 From: Stefan Hajnoczi Date: Fri, 21 Nov 2014 11:12:36 +0000 Message-Id: <1416568359-6750-2-git-send-email-stefanha@redhat.com> In-Reply-To: <1416568359-6750-1-git-send-email-stefanha@redhat.com> References: <1416568359-6750-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL for-2.2 1/4] net/slirp: fix memory leak List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Gonglei , Alexander Graf , Stefan Hajnoczi From: Gonglei commit b412eb61 introduce 'cmd:' target for guestfwd, and fwd don't be used in this scenario, and will leak memory in true branch with 'cmd:'. Let's allocate memory for fwd variable just in else statement. Cc: Alexander Graf Signed-off-by: Gonglei Reviewed-by: Jason Wang Signed-off-by: Stefan Hajnoczi --- net/slirp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/slirp.c b/net/slirp.c index dc89e6b..377d7ef 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -643,17 +643,16 @@ static int slirp_guestfwd(SlirpState *s, const char *config_str, goto fail_syntax; } - fwd = g_malloc(sizeof(struct GuestFwd)); snprintf(buf, sizeof(buf), "guestfwd.tcp.%d", port); if ((strlen(p) > 4) && !strncmp(p, "cmd:", 4)) { if (slirp_add_exec(s->slirp, 0, &p[4], &server, port) < 0) { error_report("conflicting/invalid host:port in guest forwarding " "rule '%s'", config_str); - g_free(fwd); return -1; } } else { + fwd = g_malloc(sizeof(struct GuestFwd)); fwd->hd = qemu_chr_new(buf, p, NULL); if (!fwd->hd) { error_report("could not open guest forwarding device '%s'", buf); -- 2.1.0