Skip to content

Commit

Permalink
kmod: fix resource leak in call_usermodehelper_pipe()
Browse files Browse the repository at this point in the history
Fix resource (write-pipe file) leak in call_usermodehelper_pipe().

When call_usermodehelper_exec() fails, write-pipe file is opened and
call_usermodehelper_pipe() just returns an error.  Since it is hard for
caller to determine whether the error occured when opening the pipe or
executing the helper, the caller cannot close the pipe by themselves.

I've found this resoruce leak when testing coredump.  You can check how
the resource leaks as below;

$ echo "|nocommand" > /proc/sys/kernel/core_pattern
$ ulimit -c unlimited
$ while [ 1 ]; do ./segv; done &> /dev/null &
$ cat /proc/meminfo (<- repeat it)

where segv.c is;
//-----
int main () {
        char *p = 0;
        *p = 1;
}
//-----

This patch closes write-pipe file if call_usermodehelper_exec() failed.

Signed-off-by: Masami Hiramatsu <[email protected]>
Cc: Rusty Russell <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
Masami Hiramatsu authored and torvalds committed Jan 11, 2010
1 parent 42d53b4 commit 8767ba2
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions kernel/kmod.c
Original file line number Diff line number Diff line change
Expand Up @@ -520,13 +520,15 @@ int call_usermodehelper_pipe(char *path, char **argv, char **envp,
return -ENOMEM;

ret = call_usermodehelper_stdinpipe(sub_info, filp);
if (ret < 0)
goto out;
if (ret < 0) {
call_usermodehelper_freeinfo(sub_info);
return ret;
}

return call_usermodehelper_exec(sub_info, UMH_WAIT_EXEC);
ret = call_usermodehelper_exec(sub_info, UMH_WAIT_EXEC);
if (ret < 0) /* Failed to execute helper, close pipe */
filp_close(*filp, NULL);

out:
call_usermodehelper_freeinfo(sub_info);
return ret;
}
EXPORT_SYMBOL(call_usermodehelper_pipe);
Expand Down

0 comments on commit 8767ba2

Please sign in to comment.