From: Richard Weinberger <richard@nod.at>
To: akpm@linux-foundation.org
Cc: linux-kernel@vger.kernel.org,
user-mode-linux-devel@lists.sourceforge.net,
Davidlohr Bueso <dave@gnu.org>,
Richard Weinberger <richard@nod.at>
Subject: [PATCH 04/10] uml: free resources
Date: Thu, 21 Jul 2011 11:18:28 +0200 [thread overview]
Message-ID: <1311239914-8301-4-git-send-email-richard@nod.at> (raw)
In-Reply-To: <1311239914-8301-1-git-send-email-richard@nod.at>
From: Davidlohr Bueso <dave@gnu.org>
When creating the temp file there's a memory and file descriptor leak upon error.
Signed-off-by: Davidlohr Bueso <dave@gnu.org>
Signed-off-by: Richard Weinberger <richard@nod.at>
Reviewed-by: Vitaliy Ivanov <vitalivanov@gmail.com>
---
arch/um/os-Linux/mem.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/um/os-Linux/mem.c b/arch/um/os-Linux/mem.c
index e696144..62878cf 100644
--- a/arch/um/os-Linux/mem.c
+++ b/arch/um/os-Linux/mem.c
@@ -176,7 +176,7 @@ static int __init make_tempfile(const char *template, char **out_tempname,
find_tempdir();
if ((tempdir == NULL) || (strlen(tempdir) >= MAXPATHLEN))
- return -1;
+ goto out;
if (template[0] != '/')
strcpy(tempname, tempdir);
@@ -191,13 +191,15 @@ static int __init make_tempfile(const char *template, char **out_tempname,
}
if (do_unlink && (unlink(tempname) < 0)) {
perror("unlink");
- goto out;
+ goto close;
}
if (out_tempname) {
*out_tempname = tempname;
} else
free(tempname);
return fd;
+close:
+ close(fd);
out:
free(tempname);
return -1;
--
1.7.6
next prev parent reply other threads:[~2011-07-21 9:19 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-21 9:18 [PATCH 01/10] uml: cow_user.c warning corrections Richard Weinberger
2011-07-21 9:18 ` [PATCH 02/10] uml: helper.c " Richard Weinberger
2011-07-21 9:18 ` [PATCH 03/10] uml: drivers/slip_user.c memory leak fix Richard Weinberger
2011-07-21 9:18 ` Richard Weinberger [this message]
2011-07-21 9:18 ` [PATCH 05/10] um: Disable scan_elf_aux() on x86_64 Richard Weinberger
2011-07-21 9:18 ` [PATCH 06/10] um: Set __HAVE_ARCH_GATE_AREA for i386 Richard Weinberger
2011-07-21 9:18 ` [PATCH 07/10] um: Set __HAVE_ARCH_GATE_AREA for x86_64 Richard Weinberger
2011-07-22 23:01 ` Andrew Morton
2011-07-23 12:15 ` Richard Weinberger
2011-07-21 9:18 ` [PATCH 08/10] um: Implement a x86_64 vDSO Richard Weinberger
2011-07-21 9:18 ` [PATCH 09/10] um: Ajdust size of pid_buf Richard Weinberger
2011-07-21 9:38 ` [uml-devel] " Geert Uytterhoeven
2011-07-21 9:48 ` Richard Weinberger
2011-07-21 9:18 ` [PATCH 10/10] um: Remove dead code Richard Weinberger
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=1311239914-8301-4-git-send-email-richard@nod.at \
--to=richard@nod.at \
--cc=akpm@linux-foundation.org \
--cc=dave@gnu.org \
--cc=linux-kernel@vger.kernel.org \
--cc=user-mode-linux-devel@lists.sourceforge.net \
/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
all inboxes | Powered by JetHome®