Commit 9beb266f authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Linus Torvalds

exec: proc_exec_connector() should be called only once

A separate one-liner with the minor fix.

PROC_EVENT_EXEC reports the "exec" event, but this message is sent at
least twice if search_binary_handler() is called by ->load_binary()
recursively, say, load_script().

Move it to exec_binprm(), this is "depth == 0" code too.
Signed-off-by: default avatarOleg Nesterov <oleg@redhat.com>
Acked-by: default avatarKees Cook <keescook@chromium.org>
Cc: Al Viro <viro@ZenIV.linux.org.uk>
Cc: Evgeniy Polyakov <zbr@ioremap.net>
Cc: Zach Levis <zml@linux.vnet.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 131b2f9f
...@@ -1404,7 +1404,6 @@ int search_binary_handler(struct linux_binprm *bprm) ...@@ -1404,7 +1404,6 @@ int search_binary_handler(struct linux_binprm *bprm)
if (bprm->file) if (bprm->file)
fput(bprm->file); fput(bprm->file);
bprm->file = NULL; bprm->file = NULL;
proc_exec_connector(current);
return retval; return retval;
} }
read_lock(&binfmt_lock); read_lock(&binfmt_lock);
...@@ -1455,6 +1454,7 @@ static int exec_binprm(struct linux_binprm *bprm) ...@@ -1455,6 +1454,7 @@ static int exec_binprm(struct linux_binprm *bprm)
trace_sched_process_exec(current, old_pid, bprm); trace_sched_process_exec(current, old_pid, bprm);
ptrace_event(PTRACE_EVENT_EXEC, old_vpid); ptrace_event(PTRACE_EVENT_EXEC, old_vpid);
current->did_exec = 1; current->did_exec = 1;
proc_exec_connector(current);
} }
return ret; return ret;
......
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