diff options
| author | Xinyu Chen <xinyu.chen@freescale.com> | 2012-09-29 13:38:47 +0800 |
|---|---|---|
| committer | Xinyu Chen <xinyu.chen@freescale.com> | 2012-09-29 13:38:47 +0800 |
| commit | 0cd2beb211411c2c5b8486f6364ec70b7be928f2 (patch) | |
| tree | 7a8adfce59552e3bbb95b1164065c47fe07202b3 /fs | |
| parent | 9dbada706a45219c7d61889efd24ff5e5b2d8671 (diff) | |
| parent | d6a38f44cf29c8f145c18fa5ac7f41e9b530523e (diff) | |
Merge branch 'jb' into imx_3.0.35_android
Conflicts:
drivers/cpufreq/cpufreq_interactive.c
fs/proc/base.c
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/proc/base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c index bfa13ac6738a..6a938aa9e294 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -211,7 +211,7 @@ static struct mm_struct *mm_access(struct task_struct *task, unsigned int mode) mm = get_task_mm(task); if (mm && mm != current->mm && - !ptrace_may_access(task, PTRACE_MODE_READ) && + !ptrace_may_access(task, mode) && !capable(CAP_SYS_RESOURCE)) { mmput(mm); mm = ERR_PTR(-EACCES); |