提交 11a7ac23 编写于 作者: J Jim Meyering 提交者: Linus Torvalds

uml: improved error handling while locating temp dir

* 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: NJim Meyering <meyering@redhat.com>
Signed-off-by: NJeff Dike <jdike@linux.intel.com>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 5134d8fe
......@@ -162,11 +162,6 @@ static void which_tmpdir(void)
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 char *template, char **out_tempname,
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 char *template, char **out_tempname,
}
if (out_tempname) {
*out_tempname = tempname;
} else {
} else
free(tempname);
}
return fd;
out:
free(tempname);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册