aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/umh.c
diff options
context:
space:
mode:
authorVincent Minet <v.minet@criteo.com>2020-05-08 00:14:22 +0200
committerJakub Kicinski <kuba@kernel.org>2020-05-08 19:06:55 -0700
commitdb803036ada7d61d096783726f9771b3fc540370 (patch)
tree538a193dd95f6afe20309e7af2182ec6fd7d6845 /kernel/umh.c
parent14d8f7486a344ee64c37641c70b2d67013eb9de6 (diff)
umh: fix memory leak on execve failure
If a UMH process created by fork_usermode_blob() fails to execute, a pair of struct file allocated by umh_pipe_setup() will leak. Under normal conditions, the caller (like bpfilter) needs to manage the lifetime of the UMH and its two pipes. But when fork_usermode_blob() fails, the caller doesn't really have a way to know what needs to be done. It seems better to do the cleanup ourselves in this case. Fixes: 449325b52b7a ("umh: introduce fork_usermode_blob() helper") Signed-off-by: Vincent Minet <v.minet@criteo.com> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'kernel/umh.c')
-rw-r--r--kernel/umh.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/kernel/umh.c b/kernel/umh.c
index 7f255b5a8845..20d51e0957e0 100644
--- a/kernel/umh.c
+++ b/kernel/umh.c
@@ -475,6 +475,12 @@ static void umh_clean_and_save_pid(struct subprocess_info *info)
{
struct umh_info *umh_info = info->data;
+ /* cleanup if umh_pipe_setup() was successful but exec failed */
+ if (info->pid && info->retval) {
+ fput(umh_info->pipe_to_umh);
+ fput(umh_info->pipe_from_umh);
+ }
+
argv_free(info->argv);
umh_info->pid = info->pid;
}

Privacy Policy