Commit db803036 authored by Vincent Minet's avatar Vincent Minet Committed by Jakub Kicinski

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: 449325b5 ("umh: introduce fork_usermode_blob() helper")
Signed-off-by: default avatarVincent Minet <v.minet@criteo.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 14d8f748
...@@ -475,6 +475,12 @@ static void umh_clean_and_save_pid(struct subprocess_info *info) ...@@ -475,6 +475,12 @@ static void umh_clean_and_save_pid(struct subprocess_info *info)
{ {
struct umh_info *umh_info = info->data; 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); argv_free(info->argv);
umh_info->pid = info->pid; umh_info->pid = info->pid;
} }
......
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