[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Date: Thu, 07 Jul 2011 00:02:51 -0400
From: Davidlohr Bueso <dave@....org>
To: Jeff Dike <jdike@...toit.com>, Richard Weinberger <richard@....at>
Cc: uml <user-mode-linux-devel@...ts.sourceforge.net>,
lkml <linux-kernel@...r.kernel.org>
Subject: [PATCH] uml: free resources
From: Davidlohr Bueso <dave@....org>
When creating the temp file there's a memory and file descriptor leak upon error.
Signed-off-by: Davidlohr Bueso <dave@....org>
---
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.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists