Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9d645f0 authored by Paolo 'Blaisorblade' Giarrusso's avatar Paolo 'Blaisorblade' Giarrusso Committed by Linus Torvalds
Browse files

[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: default avatarPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent b2670eac

arch/um/drivers/xterm.c

+0 −2
Original line number Diff line number Diff line
@@ -136,8 +136,6 @@ int xterm_open(int input, int output, int primary, void *d, 
		return(pid);

	}



	if(data->stack == 0) free_stack(stack, 0);



	if (data->direct_rcv) {

		new = os_rcv_fd(fd, &data->helper_pid);

	} else {

arch/um/os-Linux/helper.c

+3 −4
Original line number Diff line number Diff line
@@ -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;

}