LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH 3/5] UML - Improved error handling while locating temp dir
@ 2008-02-06 17:44 Jeff Dike
  0 siblings, 0 replies; only message in thread
From: Jeff Dike @ 2008-02-06 17:44 UTC (permalink / raw)
  To: Andrew Morton; +Cc: LKML, uml-devel, Jim Meyering

From: Jim Meyering <meyering@redhat.com>

* arch/um/os-Linux/mem.c (make_tempfile): Don't deref NULL upon failed malloc.

* arch/um/os-Linux/mem.c (make_tempfile): Handle NULL tempdir.
Don't let a long tempdir (e.g., via TMPDIR) provoke heap corruption.

[ jdike - formatting cleanups, deleted obsolete comment ]

Signed-off-by: Jim Meyering <meyering@redhat.com>
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
---
 arch/um/os-Linux/mem.c |   15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

Index: linux-2.6-git/arch/um/os-Linux/mem.c
===================================================================
--- linux-2.6-git.orig/arch/um/os-Linux/mem.c	2008-02-05 13:20:46.000000000 -0500
+++ linux-2.6-git/arch/um/os-Linux/mem.c	2008-02-05 16:37:37.000000000 -0500
@@ -162,11 +162,6 @@ found:
 	goto out;
 }
 
-/*
- * This proc still used in tt-mode
- * (file: kernel/tt/ptproxy/proxy.c, proc: start_debugger).
- * So it isn't 'static' yet.
- */
 static int __init make_tempfile(const char *template, char **out_tempname,
 				int do_unlink)
 {
@@ -175,10 +170,13 @@ static int __init make_tempfile(const ch
 
 	which_tmpdir();
 	tempname = malloc(MAXPATHLEN);
-	if (!tempname)
-		goto out;
+	if (tempname == NULL)
+		return -1;
 
 	find_tempdir();
+	if ((tempdir == NULL) || (strlen(tempdir) >= MAXPATHLEN))
+		return -1;
+
 	if (template[0] != '/')
 		strcpy(tempname, tempdir);
 	else
@@ -196,9 +194,8 @@ static int __init make_tempfile(const ch
 	}
 	if (out_tempname) {
 		*out_tempname = tempname;
-	} else {
+	} else
 		free(tempname);
-	}
 	return fd;
 out:
 	free(tempname);

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2008-02-06 17:47 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-02-06 17:44 [PATCH 3/5] UML - Improved error handling while locating temp dir Jeff Dike

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).