Skip to contentSkip to conversation

umh: fix memory leak on execve failure

PATCH In review Vincent Minet 2 participants 3 messages Apr 13, 2020 Kernel usermode helper

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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")
---
 kernel/umh.c | 6 ++++++
 1 file changed, 6 insertions(+)
kernel/umh.c +6 -0
index 7f255b5a8845..20d51e0957e0 100644
@@ -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;
 }
Signature · 1 line
2.26.0
#1 lore raw

In my case, execve fails with ENOENT on a Tomoyo enabled kernel. It doesn't seem like CONFIG_BPFILTER and CONFIG_SECURITY_TOMOYO are compatible as it is.

The UMH is executed via "do_execve_file", so we'll have bprm->filename set to "none". This causes the following call chain to fail and search_binary_handler() to return ENOENT.
search_binary_handler() ->
security_bprm_check() ->
tomoyo_bprm_check_security() ->
tomoyo_find_next_domain() ->
tomoyo_realpath_nofollow()

I don't really know how to solve this. As I understand it, you really need a "valid" pathname for Tomoyo and it's not obvious what that should be for the user-mode blob.

Signature · 1 line
Vincent Minet
#2 lore raw

Hello.

Quoted 2 lines · Vincent Minet

In my case, execve fails with ENOENT on a Tomoyo enabled kernel. It doesn't seem like CONFIG_BPFILTER and CONFIG_SECURITY_TOMOYO are compatible as it is.

Thanks for the report. Yes, I know this is a potential problem since 3.19 and this is a practical problem since 4.18, as explained at
https://lkml.kernel.org/r/[email protected] .

Quoted 10 lines

The UMH is executed via "do_execve_file", so we'll have bprm->filename set to "none". This causes the following call chain to fail and search_binary_handler() to return ENOENT.
search_binary_handler() ->
security_bprm_check() ->
tomoyo_bprm_check_security() ->
tomoyo_find_next_domain() ->
tomoyo_realpath_nofollow()

Quoted 3 lines

I don't really know how to solve this. As I understand it, you really need a "valid" pathname for Tomoyo and it's not obvious what that should be for the user-mode blob.

It seems that Al wants to change __do_execve_file(), as commented at
https://lkml.kernel.org/r/[email protected] . Bringing tomoyo_realpath_nofollow() to __do_execve_file() (in other words, solve AT_SYMLINK_NOFOLLOW path and !AT_SYMLINK_NOFOLLOW path at the same time) will be the right (from the perspective of race-free) solution. But I don't know an API that allows resolving !AT_SYMLINK_NOFOLLOW path starting
from AT_SYMLINK_NOFOLLOW path. I need to wait for Al, for I can't implement
race-free solution from TOMOYO side.