qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: ajia@redhat.com
To: qemu-devel@nongnu.org
Cc: Alex Jia <ajia@redhat.com>
Subject: [Qemu-devel] [PATCH] linux-user: fix memory leak in failure path
Date: Wed, 28 Sep 2011 14:57:02 +0800	[thread overview]
Message-ID: <1317193022-13504-2-git-send-email-ajia@redhat.com> (raw)
In-Reply-To: <1317193022-13504-1-git-send-email-ajia@redhat.com>

From: Alex Jia <ajia@redhat.com>

Haven't released memory of 'array' and 'host_mb' in failure paths.

Signed-off-by: Alex Jia <ajia@redhat.com>
---
 linux-user/syscall.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 7735008..922c2a0 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -2523,8 +2523,10 @@ static inline abi_long do_semctl(int semid, int semnum, int cmd,
 	case GETALL:
 	case SETALL:
             err = target_to_host_semarray(semid, &array, target_su.array);
-            if (err)
+            if (err) {
+                free(array);
                 return err;
+            }
             arg.array = array;
             ret = get_errno(semctl(semid, semnum, cmd, arg));
             err = host_to_target_semarray(semid, target_su.array, &array);
@@ -2779,9 +2781,9 @@ static inline abi_long do_msgrcv(int msqid, abi_long msgp,
     }
 
     target_mb->mtype = tswapl(host_mb->mtype);
-    free(host_mb);
 
 end:
+    free(host_mb);
     if (target_mb)
         unlock_user_struct(target_mb, msgp, 1);
     return ret;
-- 
1.7.1

  reply	other threads:[~2011-09-28  6:57 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-09-28  6:57 [Qemu-devel] [PATCH] fix memory leak in aio_write_f ajia
2011-09-28  6:57 ` ajia [this message]
2011-09-28  7:55   ` [Qemu-devel] [PATCH] linux-user: fix memory leak in failure path Peter Maydell
2011-09-28  8:27     ` Alex Jia
2011-10-17  9:57 ` [Qemu-devel] [PATCH] fix memory leak in aio_write_f Kevin Wolf

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=1317193022-13504-2-git-send-email-ajia@redhat.com \
    --to=ajia@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).