Skip to content

Commit 96cfe2c

Browse files
surenbaghdasaryantorvalds
authored andcommitted
mm/madvise: replace ptrace attach requirement for process_madvise
process_madvise currently requires ptrace attach capability. PTRACE_MODE_ATTACH gives one process complete control over another process. It effectively removes the security boundary between the two processes (in one direction). Granting ptrace attach capability even to a system process is considered dangerous since it creates an attack surface. This severely limits the usage of this API. The operations process_madvise can perform do not affect the correctness of the operation of the target process; they only affect where the data is physically located (and therefore, how fast it can be accessed). What we want is the ability for one process to influence another process in order to optimize performance across the entire system while leaving the security boundary intact. Replace PTRACE_MODE_ATTACH with a combination of PTRACE_MODE_READ and CAP_SYS_NICE. PTRACE_MODE_READ to prevent leaking ASLR metadata and CAP_SYS_NICE for influencing process performance. Link: https://lkml.kernel.org/r/20210303185807.2160264-1-surenb@google.com Signed-off-by: Suren Baghdasaryan <surenb@google.com> Reviewed-by: Kees Cook <keescook@chromium.org> Acked-by: Minchan Kim <minchan@kernel.org> Acked-by: David Rientjes <rientjes@google.com> Cc: Jann Horn <jannh@google.com> Cc: Jeff Vander Stoep <jeffv@google.com> Cc: Michal Hocko <mhocko@suse.com> Cc: Shakeel Butt <shakeelb@google.com> Cc: Tim Murray <timmurray@google.com> Cc: Florian Weimer <fweimer@redhat.com> Cc: Oleg Nesterov <oleg@redhat.com> Cc: James Morris <jmorris@namei.org> Cc: <stable@vger.kernel.org> [5.10+] Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent 149fc78 commit 96cfe2c

1 file changed

Lines changed: 12 additions & 1 deletion

File tree

mm/madvise.c

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1198,12 +1198,22 @@ SYSCALL_DEFINE5(process_madvise, int, pidfd, const struct iovec __user *, vec,
11981198
goto release_task;
11991199
}
12001200

1201-
mm = mm_access(task, PTRACE_MODE_ATTACH_FSCREDS);
1201+
/* Require PTRACE_MODE_READ to avoid leaking ASLR metadata. */
1202+
mm = mm_access(task, PTRACE_MODE_READ_FSCREDS);
12021203
if (IS_ERR_OR_NULL(mm)) {
12031204
ret = IS_ERR(mm) ? PTR_ERR(mm) : -ESRCH;
12041205
goto release_task;
12051206
}
12061207

1208+
/*
1209+
* Require CAP_SYS_NICE for influencing process performance. Note that
1210+
* only non-destructive hints are currently supported.
1211+
*/
1212+
if (!capable(CAP_SYS_NICE)) {
1213+
ret = -EPERM;
1214+
goto release_mm;
1215+
}
1216+
12071217
total_len = iov_iter_count(&iter);
12081218

12091219
while (iov_iter_count(&iter)) {
@@ -1218,6 +1228,7 @@ SYSCALL_DEFINE5(process_madvise, int, pidfd, const struct iovec __user *, vec,
12181228
if (ret == 0)
12191229
ret = total_len - iov_iter_count(&iter);
12201230

1231+
release_mm:
12211232
mmput(mm);
12221233
release_task:
12231234
put_task_struct(task);

0 commit comments

Comments
 (0)