|
Message-ID: <20180511093613.GA1330@comp-core-i7-2640m-0182e6> Date: Fri, 11 May 2018 11:36:14 +0200 From: Alexey Gladkov <gladkov.alexey@...il.com> To: Kees Cook <keescook@...omium.org>, Andy Lutomirski <luto@...nel.org>, Andrew Morton <akpm@...ux-foundation.org>, linux-fsdevel@...r.kernel.org, linux-kernel@...r.kernel.org, kernel-hardening@...ts.openwall.com, linux-security-module@...r.kernel.org, linux-api@...r.kernel.org Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>, Alexander Viro <viro@...iv.linux.org.uk>, Akinobu Mita <akinobu.mita@...il.com>, Oleg Nesterov <oleg@...hat.com>, Jeff Layton <jlayton@...chiereds.net>, Ingo Molnar <mingo@...nel.org>, Alexey Dobriyan <adobriyan@...il.com>, "Eric W. Biederman" <ebiederm@...ssion.com>, Linus Torvalds <torvalds@...ux-foundation.org>, aniel Micay <danielmicay@...il.com>, Jonathan Corbet <corbet@....net>, bfields@...ldses.org, Stephen Rothwell <sfr@...b.auug.org.au>, solar@...nwall.com, "Dmitry V. Levin" <ldv@...linux.org>, Djalal Harouni <tixxdz@...il.com> Subject: [PATCH v5 5/7] proc: instantiate only pids that we can ptrace on 'limit_pids=1' mount option From: Djalal Harouni <tixxdz@...il.com> If "limit_pids=1" mount option is set then do not instantiate pids that we can not ptrace. "limit_pids=1" means that procfs should only contain pids that the caller can ptrace. Cc: Kees Cook <keescook@...omium.org> Cc: Andy Lutomirski <luto@...nel.org> Signed-off-by: Djalal Harouni <tixxdz@...il.com> --- fs/proc/base.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/fs/proc/base.c b/fs/proc/base.c index 6f084344..31baeef 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -3187,6 +3187,7 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, unsign unsigned tgid; struct proc_fs_info *fs_info = proc_sb(dir->i_sb); struct pid_namespace *ns = fs_info->pid_ns; + int limit_pids = proc_fs_limit_pids(fs_info); tgid = name_to_int(&dentry->d_name); if (tgid == ~0U) @@ -3200,7 +3201,15 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, unsign if (!task) goto out; + /* Limit procfs to only ptracable tasks */ + if (limit_pids == PROC_LIMIT_PIDS_PTRACE) { + cond_resched(); + if (!has_pid_permissions(fs_info, task, HIDEPID_NO_ACCESS)) + goto out_put_task; + } + result = proc_pid_instantiate(dir, dentry, task, NULL); +out_put_task: put_task_struct(task); out: return ERR_PTR(result); -- 2.10.5
Powered by blists - more mailing lists
Confused about mailing lists and their use? Read about mailing lists on Wikipedia and check out these guidelines on proper formatting of your messages.