summary refs log tree commit diff stats
path: root/net/slirp.c
diff options
context:
space:
mode:
authorGonglei <arei.gonglei@huawei.com>2014-11-20 19:35:00 +0800
committerStefan Hajnoczi <stefanha@redhat.com>2014-11-21 10:50:54 +0000
commit7a8919dc29a9f46dcadd950c2aa1acf74f28974d (patch)
treecb0c3885530c49805e72ab8fc90cae32bbf012ea /net/slirp.c
parent9c7074da5ec64e1fd61df881ab291f75541ff2b0 (diff)
downloadfocaccia-qemu-7a8919dc29a9f46dcadd950c2aa1acf74f28974d.tar.gz
focaccia-qemu-7a8919dc29a9f46dcadd950c2aa1acf74f28974d.zip
net/slirp: fix memory leak
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 <agraf@suse.de>
Signed-off-by: Gonglei <arei.gonglei@huawei.com>
Reviewed-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'net/slirp.c')
-rw-r--r--net/slirp.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/slirp.c b/net/slirp.c
index dc89e6b086..377d7ef8c0 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);