2 files changed, 5 insertions, 4 deletions

diff --git a/fs/exec.c b/fs/exec.c
index 23559c227d9c..644f6c4eb606 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1370,7 +1370,7 @@ int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs)
         unsigned int depth = bprm->recursion_depth;
         int try,retval;
         struct linux_binfmt *fmt;
-        pid_t old_pid;
+        pid_t old_pid, old_vpid;
 
         retval = security_bprm_check(bprm);
         if (retval)
@@ -1381,8 +1381,9 @@ int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs)
                 return retval;
 
         /* Need to fetch pid before load_binary changes it */
+        old_pid = current->pid;
         rcu_read_lock();
-        old_pid = task_pid_nr_ns(current, task_active_pid_ns(current->parent));
+        old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent));
         rcu_read_unlock();
 
         retval = -ENOENT;
@@ -1405,7 +1406,7 @@ int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs)
                         if (retval >= 0) {
                                 if (depth == 0) {
                                         trace_sched_process_exec(current, old_pid, bprm);
-                                        ptrace_event(PTRACE_EVENT_EXEC, old_pid);
+                                        ptrace_event(PTRACE_EVENT_EXEC, old_vpid);
                                 }
                                 put_binfmt(fmt);
                                 allow_write_access(bprm->file);
diff --git a/include/trace/events/sched.h b/include/trace/events/sched.h
index fbc7b1ad929b..ea7a2035456d 100644
--- a/include/trace/events/sched.h
+++ b/include/trace/events/sched.h
@@ -295,7 +295,7 @@ TRACE_EVENT(sched_process_exec,
         TP_fast_assign(
                 __assign_str(filename, bprm->filename);
                 __entry->pid            = p->pid;
-                __entry->old_pid        = p->pid;
+                __entry->old_pid        = old_pid;
         ),
 
         TP_printk("filename=%s pid=%d old_pid=%d", __get_str(filename),