aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorNick Desaulniers <ndesaulniers@google.com>2017-05-04 13:25:44 -0700
committerdev-harsh1998 <harshitjain6751@gmail.com>2017-07-15 10:10:52 +0200
commit34e40006f37392aaaed482d1bc33503b82b032d6 (patch)
treebbf0099af8e0e4c84d3eb505dad85bcd79a7c4b6 /kernel
parentebaa9c5fc9f349185dcf98ed1ca48bdbcf97b978 (diff)
Revert "proc: smaps: Allow smaps access for CAP_SYS_RESOURCE"HEADn7.1
This reverts commit f0ce0eee6b71bc310153edb87e66e6b25e12fece. Bug: 34951864 Bug: 36468447 Change-Id: I87bd92e096c6c28a53b9ecf302ae008f5e58eba1 Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/fork.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/fork.c b/kernel/fork.c
index 4adf3bb29d2..a6715aedf90 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -723,8 +723,7 @@ 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, mode) &&
- !capable(CAP_SYS_RESOURCE)) {
+ !ptrace_may_access(task, mode)) {
mmput(mm);
mm = ERR_PTR(-EACCES);
}