The patch titled uml: Fix handling of failed execs of helpers has been added to the -mm tree. Its filename is uml-fix-handling-of-failed-execs-of-helpers.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: uml: Fix handling of failed execs of helpers From: Jeff Dike <jdike@xxxxxxxxxxx> There were some bugs in handling failures to exec helper programs. errno was passed back from the child with the wrong sign. It was also ignored. In the case where it mattered, the errno from the (successful) read in the parent was used instead. Signed-off-by: Jeff Dike <jdike@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- arch/um/os-Linux/helper.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff -puN arch/um/os-Linux/helper.c~uml-fix-handling-of-failed-execs-of-helpers arch/um/os-Linux/helper.c --- a/arch/um/os-Linux/helper.c~uml-fix-handling-of-failed-execs-of-helpers +++ a/arch/um/os-Linux/helper.c @@ -42,7 +42,7 @@ static int helper_child(void *arg) if(data->pre_exec != NULL) (*data->pre_exec)(data->pre_data); execvp(argv[0], argv); - errval = errno; + errval = -errno; printk("helper_child - execve of '%s' failed - errno = %d\n", argv[0], errno); os_write_file(data->fd, &errval, sizeof(errval)); kill(os_getpid(), SIGKILL); @@ -62,7 +62,7 @@ int run_helper(void (*pre_exec)(void *), stack = *stack_out; else stack = alloc_stack(0, __cant_sleep()); if(stack == 0) - return(-ENOMEM); + return -ENOMEM; ret = os_pipe(fds, 1, 0); if(ret < 0){ @@ -95,16 +95,16 @@ int run_helper(void (*pre_exec)(void *), /* 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)); - if (n < 0) { - printk("run_helper : read on pipe failed, ret = %d\n", -n); - ret = n; - kill(pid, SIGKILL); - CATCH_EINTR(waitpid(pid, NULL, 0)); - } else if(n != 0){ - CATCH_EINTR(n = waitpid(pid, NULL, 0)); - ret = -errno; - } else { + if(n == 0) ret = pid; + else { + if(n < 0){ + printk("run_helper : read on pipe failed, ret = %d\n", + -n); + ret = n; + kill(pid, SIGKILL); + } + CATCH_EINTR(waitpid(pid, NULL, 0)); } out_close: _ Patches currently in -mm which might be from jdike@xxxxxxxxxxx are reduce-max_nr_zones-make-zone_highmem-optional-fix-fix-fix.patch fix-x86_64-mm-i386-semaphore-to-asm-uml-fix.patch uml-use-klibc-setjmp-longjmp.patch uml-use-array_size-more-assiduously.patch uml-fix-stack-alignment.patch uml-whitespace-fixes.patch uml-fix-handling-of-failed-execs-of-helpers.patch uml-improve-sigbus-diagnostics.patch uml-remove-pte_mkexec.patch vdso-hash-style-fix.patch vdso-hash-style-fix-fix.patch namespaces-utsname-switch-to-using-uts-namespaces-uml-fix.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html