Commit 2db9dbf7 authored by Bernd Edlinger's avatar Bernd Edlinger Committed by Eric W. Biederman

proc: Use new infrastructure to fix deadlocks in execve

This changes lock_trace to use the new exec_update_mutex
instead of cred_guard_mutex.

This fixes possible deadlocks when the trace is accessing
/proc/$pid/stack for instance.

This should be safe, as the credentials are only used for reading,
and task->mm is updated on execve under the new exec_update_mutex.
Signed-off-by: default avatarBernd Edlinger <bernd.edlinger@hotmail.de>
Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
parent 454e3126
...@@ -405,11 +405,11 @@ static int proc_pid_wchan(struct seq_file *m, struct pid_namespace *ns, ...@@ -405,11 +405,11 @@ static int proc_pid_wchan(struct seq_file *m, struct pid_namespace *ns,
static int lock_trace(struct task_struct *task) static int lock_trace(struct task_struct *task)
{ {
int err = mutex_lock_killable(&task->signal->cred_guard_mutex); int err = mutex_lock_killable(&task->signal->exec_update_mutex);
if (err) if (err)
return err; return err;
if (!ptrace_may_access(task, PTRACE_MODE_ATTACH_FSCREDS)) { if (!ptrace_may_access(task, PTRACE_MODE_ATTACH_FSCREDS)) {
mutex_unlock(&task->signal->cred_guard_mutex); mutex_unlock(&task->signal->exec_update_mutex);
return -EPERM; return -EPERM;
} }
return 0; return 0;
...@@ -417,7 +417,7 @@ static int lock_trace(struct task_struct *task) ...@@ -417,7 +417,7 @@ static int lock_trace(struct task_struct *task)
static void unlock_trace(struct task_struct *task) static void unlock_trace(struct task_struct *task)
{ {
mutex_unlock(&task->signal->cred_guard_mutex); mutex_unlock(&task->signal->exec_update_mutex);
} }
#ifdef CONFIG_STACKTRACE #ifdef CONFIG_STACKTRACE
......
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