aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavidlohr Bueso <dave@gnu.org>2011-07-25 20:12:52 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-25 23:57:13 -0400
commit2a6d0ac182688d4d23357ece744978706c044aad (patch)
tree6a8daa134fe8af112b0d234b4ca417a16e59d5e5
parent9a8beb93067764344523386e0e5388d3fd78add7 (diff)
uml: free resources
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> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/um/os-Linux/mem.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/um/os-Linux/mem.c b/arch/um/os-Linux/mem.c
index e696144d2be3..62878cf1d33f 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,
176 176
177 find_tempdir(); 177 find_tempdir();
178 if ((tempdir == NULL) || (strlen(tempdir) >= MAXPATHLEN)) 178 if ((tempdir == NULL) || (strlen(tempdir) >= MAXPATHLEN))
179 return -1; 179 goto out;
180 180
181 if (template[0] != '/') 181 if (template[0] != '/')
182 strcpy(tempname, tempdir); 182 strcpy(tempname, tempdir);
@@ -191,13 +191,15 @@ static int __init make_tempfile(const char *template, char **out_tempname,
191 } 191 }
192 if (do_unlink && (unlink(tempname) < 0)) { 192 if (do_unlink && (unlink(tempname) < 0)) {
193 perror("unlink"); 193 perror("unlink");
194 goto out; 194 goto close;
195 } 195 }
196 if (out_tempname) { 196 if (out_tempname) {
197 *out_tempname = tempname; 197 *out_tempname = tempname;
198 } else 198 } else
199 free(tempname); 199 free(tempname);
200 return fd; 200 return fd;
201close:
202 close(fd);
201out: 203out:
202 free(tempname); 204 free(tempname);
203 return -1; 205 return -1;