summaryrefslogtreecommitdiffstats
path: root/arch/um/os-Linux/helper.c
diff options
context:
space:
mode:
authorPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>2006-10-20 08:28:24 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-20 19:26:36 +0200
commitd9d645f06a8f50659bbae2be64ed8367ba068fc0 (patch)
treea514ffe62493538e0e5725685380b961e6ca4483 /arch/um/os-Linux/helper.c
parent[PATCH] uml: use DEFCONFIG_LIST to avoid reading host's config (diff)
downloadlinux-d9d645f06a8f50659bbae2be64ed8367ba068fc0.tar.xz
linux-d9d645f06a8f50659bbae2be64ed8367ba068fc0.zip
[PATCH] uml: cleanup run_helper() API to fix a leak
Freeing the stack is left uselessly to the caller of run_helper in some cases - this is taken from run_helper_thread, but here it is useless, so no caller needs it and the only place where this happens has a potential leak - in case of error neither run_helper() nor xterm_open() call free_stack(). At this point passing a pointer is not needed - the stack pointer should be passed directly, but this change is not done here. Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Cc: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/um/os-Linux/helper.c')
-rw-r--r--arch/um/os-Linux/helper.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/um/os-Linux/helper.c b/arch/um/os-Linux/helper.c
index 8a78bf03b468..d13299cfa318 100644
--- a/arch/um/os-Linux/helper.c
+++ b/arch/um/os-Linux/helper.c
@@ -50,7 +50,8 @@ static int helper_child(void *arg)
}
/* Returns either the pid of the child process we run or -E* on failure.
- * XXX The alloc_stack here breaks if this is called in the tracing thread */
+ * XXX The alloc_stack here breaks if this is called in the tracing thread, so
+ * we need to receive a preallocated stack (a local buffer is ok). */
int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv,
unsigned long *stack_out)
{
@@ -113,10 +114,8 @@ out_close:
close(fds[1]);
close(fds[0]);
out_free:
- if (stack_out == NULL)
+ if ((stack_out == NULL) || (*stack_out == 0))
free_stack(stack, 0);
- else
- *stack_out = stack;
return ret;
}