Commit b1c332c9 authored by Paolo 'Blaisorblade' Giarrusso's avatar Paolo 'Blaisorblade' Giarrusso Committed by Linus Torvalds

[PATCH] uml: fix hang on run_helper() failure on uml_net

Fix an hang on a pipe when run_helper() fails when called by change_tramp()
(i.e.  when calling uml_net) - reproduced the bug and verified this fixes it.
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 e6fb54ab
...@@ -182,7 +182,9 @@ static int change_tramp(char **argv, char *output, int output_len) ...@@ -182,7 +182,9 @@ static int change_tramp(char **argv, char *output, int output_len)
pe_data.stdout = fds[1]; pe_data.stdout = fds[1];
pid = run_helper(change_pre_exec, &pe_data, argv, NULL); pid = run_helper(change_pre_exec, &pe_data, argv, NULL);
if (pid > 0) /* Avoid hang as we won't get data in failure case. */
read_output(fds[0], output, output_len); read_output(fds[0], output, output_len);
os_close_file(fds[0]); os_close_file(fds[0]);
os_close_file(fds[1]); os_close_file(fds[1]);
......
...@@ -43,7 +43,7 @@ static int helper_child(void *arg) ...@@ -43,7 +43,7 @@ static int helper_child(void *arg)
(*data->pre_exec)(data->pre_data); (*data->pre_exec)(data->pre_data);
execvp(argv[0], argv); execvp(argv[0], argv);
errval = errno; errval = errno;
printk("execvp of '%s' failed - errno = %d\n", argv[0], errno); printk("helper_child - execve of '%s' failed - errno = %d\n", argv[0], errno);
os_write_file(data->fd, &errval, sizeof(errval)); os_write_file(data->fd, &errval, sizeof(errval));
kill(os_getpid(), SIGKILL); kill(os_getpid(), SIGKILL);
return(0); return(0);
...@@ -92,15 +92,15 @@ int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv, ...@@ -92,15 +92,15 @@ int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv,
close(fds[1]); close(fds[1]);
fds[1] = -1; fds[1] = -1;
/*Read the errno value from the child.*/ /* Read the errno value from the child, if the exec failed, or get 0 if
* the exec succeeded because the pipe fd was set as close-on-exec. */
n = os_read_file(fds[0], &ret, sizeof(ret)); n = os_read_file(fds[0], &ret, sizeof(ret));
if(n < 0){ if (n < 0) {
printk("run_helper : read on pipe failed, ret = %d\n", -n); printk("run_helper : read on pipe failed, ret = %d\n", -n);
ret = n; ret = n;
kill(pid, SIGKILL); kill(pid, SIGKILL);
CATCH_EINTR(waitpid(pid, NULL, 0)); CATCH_EINTR(waitpid(pid, NULL, 0));
} } else if(n != 0){
else if(n != 0){
CATCH_EINTR(n = waitpid(pid, NULL, 0)); CATCH_EINTR(n = waitpid(pid, NULL, 0));
ret = -errno; ret = -errno;
} else { } else {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment