diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-08-01 15:32:39 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-08-01 15:32:39 -0400 |
| commit | 4e2019aa2748ab198f49391474072d5c63ef7b67 (patch) | |
| tree | 35d0b2889efbc61c9708a9f045691bfac528dc47 | |
| parent | b6dd242df8547b7cc5c9a6dfbc8843286e7127f3 (diff) | |
| download | longterm-queue-2.6.34-4e2019aa2748ab198f49391474072d5c63ef7b67.tar.gz | |
fix compile error on cred_guard_mutex
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/deal-with-races-in-proc-syscall-stack-personality.patch | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/queue/deal-with-races-in-proc-syscall-stack-personality.patch b/queue/deal-with-races-in-proc-syscall-stack-personality.patch index cb1db51..8d2c80b 100644 --- a/queue/deal-with-races-in-proc-syscall-stack-personality.patch +++ b/queue/deal-with-races-in-proc-syscall-stack-personality.patch @@ -13,6 +13,7 @@ and stack it's a real problem. Fix: check that task is tracable for you at the time of read(). Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> +[PG: in .34 cred_guard_mutex is in task, not task->signal] Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/proc/base.c b/fs/proc/base.c @@ -25,11 +26,11 @@ index 08741b0..52be01a 100644 +static int lock_trace(struct task_struct *task) +{ -+ int err = mutex_lock_killable(&task->signal->cred_guard_mutex); ++ int err = mutex_lock_killable(&task->cred_guard_mutex); + if (err) + return err; + if (!ptrace_may_access(task, PTRACE_MODE_ATTACH)) { -+ mutex_unlock(&task->signal->cred_guard_mutex); ++ mutex_unlock(&task->cred_guard_mutex); + return -EPERM; + } + return 0; @@ -37,7 +38,7 @@ index 08741b0..52be01a 100644 + +static void unlock_trace(struct task_struct *task) +{ -+ mutex_unlock(&task->signal->cred_guard_mutex); ++ mutex_unlock(&task->cred_guard_mutex); +} + #ifdef CONFIG_STACKTRACE |