From patchwork Tue Apr 25 12:23:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Djalal Harouni X-Patchwork-Id: 9698093 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DA98760249 for ; Tue, 25 Apr 2017 12:26:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BEA0E28484 for ; Tue, 25 Apr 2017 12:26:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B2FF42858D; Tue, 25 Apr 2017 12:26:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1F92928484 for ; Tue, 25 Apr 2017 12:26:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1947465AbdDYM04 (ORCPT ); Tue, 25 Apr 2017 08:26:56 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:34173 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1947460AbdDYMYc (ORCPT ); Tue, 25 Apr 2017 08:24:32 -0400 Received: by mail-wm0-f66.google.com with SMTP id z129so24576087wmb.1; Tue, 25 Apr 2017 05:24:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=cK4YKDuFPcpBj1lp9pjlRSeCodGdjBkzHWBGNczL1hA=; b=hprrFf2PMWgFYDpUrtFPlnBu2V5dcIxfkUHjTV0OgFEX5aK5qa/4i2Do8fnFo5Pr23 KqXhNTTWpz0MktEC/HUkYqDLSt5lyYopJMxOeVKFETq+bM4B1RLfRhfSIU0hFhdkqAzh 7MOVzYUInHTxz5gCM4G1O//e3qguu5UVYn7MVzKthDiggzyQyDr1QfMPHbx5AZQyYFzz YInLyGj50wb74CTwbZxo/ipBedaILYNI+ZZ+SW22NcymnWf/Z8gBqyDj/O2cq+S+o5aA 0aAPqtkq4ONTmdL8zOMKlzcPKXh+uG2Gj4DpCNrD8vfTN+ZuWBteL44IlxyCzsQGXrW3 mfkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=cK4YKDuFPcpBj1lp9pjlRSeCodGdjBkzHWBGNczL1hA=; b=d9euQBajqgQZyLQ/PPlR1I5wlbLqkIVSqChwuwPjkkOp8BBXuE+9UZZ4PC3uxmrDhm vDRazUHickRLJXPzd9/zLeUvq+Ti7osgyNH6dSGA6fkzi7sFOCJlMK6lffy2GWBm8St/ SKLbNt1mLTRM2COQs18l0BoGFWM1IvaR54RDaIncTrIbstR/wFGt8Tw1SJG4016v7N24 2ZqYg2gibyOtqKned1i3m3JbWD5GhBqqrOh/B/orXF6XcAUHLz5njysp5ELho4rrjILl OWNKCT7O+EI8ddghDkAZDEjCXs4OrP54TOnNzfpHyKN3keMOdmCbR2DnWPReiTqSTb2C bqRQ== X-Gm-Message-State: AN3rC/7VFkaCT2CeUPttZ+Gq4PCaDbhKoPf6DvAZmG9sNAfvqPgDLMd9 Vm/LjWSPGBeicQ== X-Received: by 10.80.151.183 with SMTP id e52mr5007102edb.61.1493123069498; Tue, 25 Apr 2017 05:24:29 -0700 (PDT) Received: from dztty2.localdomain ([2a02:8109:a4bf:e114:7e7a:91ff:fe9c:44e2]) by smtp.gmail.com with ESMTPSA id g12sm5037865eda.37.2017.04.25.05.24.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Apr 2017 05:24:28 -0700 (PDT) From: Djalal Harouni To: Linux Kernel Mailing List , Andy Lutomirski , Kees Cook , Andrew Morton , linux-fsdevel@vger.kernel.org, kernel-hardening@lists.openwall.com, linux-security-module@vger.kernel.org Cc: Linux API , Dongsu Park , Casey Schaufler , James Morris , , Jeff Layton , , Alexander Viro , Alexey Dobriyan , Ingo Molnar , , Oleg Nesterov , Michal Hocko , Jonathan Corbet , Djalal Harouni Subject: [PATCH RFC v2 6/6] proc: flush task dcache entries from all procfs instances Date: Tue, 25 Apr 2017 14:23:58 +0200 Message-Id: <1493123038-30590-7-git-send-email-tixxdz@gmail.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1493123038-30590-1-git-send-email-tixxdz@gmail.com> References: <1493123038-30590-1-git-send-email-tixxdz@gmail.com> Sender: owner-linux-security-module@vger.kernel.org Precedence: bulk List-ID: X-Virus-Scanned: ClamAV using ClamSMTP This allows to flush dcache entries of a task on multiple procfs mounts per pid namespace. Cc: Kees Cook Cc: Andy Lutomirski Signed-off-by: Djalal Harouni --- fs/proc/base.c | 27 ++++++++++++++++++++++----- fs/proc/inode.c | 9 ++++++++- fs/proc/root.c | 10 ++++++++++ include/linux/pid_namespace.h | 42 ++++++++++++++++++++++++++++++++++++++++++ include/linux/proc_fs.h | 2 ++ 5 files changed, 84 insertions(+), 6 deletions(-) diff --git a/fs/proc/base.c b/fs/proc/base.c index a663284..3c35126 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -3030,7 +3030,8 @@ static const struct inode_operations proc_tgid_base_inode_operations = { .permission = proc_pid_permission, }; -static void proc_flush_task_mnt(struct vfsmount *mnt, pid_t pid, pid_t tgid) +static void proc_flush_task_mnt_root(struct dentry *mnt_root, + pid_t pid, pid_t tgid) { struct dentry *dentry, *leader, *dir; char buf[PROC_NUMBUF]; @@ -3039,7 +3040,7 @@ static void proc_flush_task_mnt(struct vfsmount *mnt, pid_t pid, pid_t tgid) name.name = buf; name.len = snprintf(buf, sizeof(buf), "%d", pid); /* no ->d_hash() rejects on procfs */ - dentry = d_hash_and_lookup(mnt->mnt_root, &name); + dentry = d_hash_and_lookup(mnt_root, &name); if (dentry) { d_invalidate(dentry); dput(dentry); @@ -3050,7 +3051,7 @@ static void proc_flush_task_mnt(struct vfsmount *mnt, pid_t pid, pid_t tgid) name.name = buf; name.len = snprintf(buf, sizeof(buf), "%d", tgid); - leader = d_hash_and_lookup(mnt->mnt_root, &name); + leader = d_hash_and_lookup(mnt_root, &name); if (!leader) goto out; @@ -3105,14 +3106,30 @@ void proc_flush_task(struct task_struct *task) int i; struct pid *pid, *tgid; struct upid *upid; + struct proc_fs_info *fs_info_entry; + struct pid_namespace *pid_ns; + struct dentry *mnt_root; pid = task_pid(task); tgid = task_tgid(task); for (i = 0; i <= pid->level; i++) { upid = &pid->numbers[i]; - proc_flush_task_mnt(upid->ns->proc_mnt, upid->nr, - tgid->numbers[i].nr); + pid_ns = upid->ns; + + pidns_proc_lock_shared(pid_ns); + list_for_each_entry(fs_info_entry, &pid_ns->procfs_mounts, + pidns_entry) { + if (proc_fs_newinstance(fs_info_entry)) { + mnt_root = fs_info_entry->sb->s_root; + proc_flush_task_mnt_root(mnt_root, upid->nr, + tgid->numbers[i].nr); + } + } + pidns_proc_unlock_shared(pid_ns); + + mnt_root = pid_ns->proc_mnt->mnt_root; + proc_flush_task_mnt_root(mnt_root, upid->nr, tgid->numbers[i].nr); } } diff --git a/fs/proc/inode.c b/fs/proc/inode.c index b4ee4a1..f374dac 100644 --- a/fs/proc/inode.c +++ b/fs/proc/inode.c @@ -479,10 +479,17 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de) int proc_fill_super(struct super_block *s, void *data, int silent) { struct proc_fs_info *fs_info = proc_sb(s); + struct pid_namespace *ns = get_pid_ns(fs_info->pid_ns); struct inode *root_inode; int ret; - get_pid_ns(fs_info->pid_ns); + fs_info->sb = s; + + if (proc_fs_newinstance(fs_info)) { + pidns_proc_lock(ns); + list_add_tail(&fs_info->pidns_entry, &ns->procfs_mounts); + pidns_proc_unlock(ns); + } if (!proc_parse_options(data, fs_info)) return -EINVAL; diff --git a/fs/proc/root.c b/fs/proc/root.c index f398c14..3f04584 100644 --- a/fs/proc/root.c +++ b/fs/proc/root.c @@ -248,6 +248,13 @@ static void proc_kill_sb(struct super_block *sb) dput(fs_info->proc_self); if (fs_info->proc_thread_self) dput(fs_info->proc_thread_self); + + if (proc_fs_newinstance(fs_info)) { + pidns_proc_lock(ns); + list_del(&fs_info->pidns_entry); + pidns_proc_unlock(ns); + } + kill_anon_super(sb); put_pid_ns(ns); kfree(fs_info); @@ -363,6 +370,9 @@ int pid_ns_prepare_proc(struct pid_namespace *ns) return PTR_ERR(mnt); ns->proc_mnt = mnt; + init_rwsem(&ns->rw_procfs_mnts); + INIT_LIST_HEAD(&ns->procfs_mounts); + return 0; } diff --git a/include/linux/pid_namespace.h b/include/linux/pid_namespace.h index 306bdc6..377b751 100644 --- a/include/linux/pid_namespace.h +++ b/include/linux/pid_namespace.h @@ -39,6 +39,8 @@ struct pid_namespace { struct pid_namespace *parent; #ifdef CONFIG_PROC_FS struct vfsmount *proc_mnt; /* Internal proc mounted during each new pidns */ + struct rw_semaphore rw_procfs_mnts; + struct list_head procfs_mounts; /* list of separated procfs mounts */ #endif #ifdef CONFIG_BSD_PROCESS_ACCT struct fs_pin *bacct; @@ -105,4 +107,44 @@ extern struct pid_namespace *task_active_pid_ns(struct task_struct *tsk); void pidhash_init(void); void pidmap_init(void); +#ifdef CONFIG_PROC_FS +static inline void pidns_proc_lock(struct pid_namespace *pid_ns) +{ + down_write(&pid_ns->rw_procfs_mnts); +} + +static inline void pidns_proc_unlock(struct pid_namespace *pid_ns) +{ + up_write(&pid_ns->rw_procfs_mnts); +} + +static inline void pidns_proc_lock_shared(struct pid_namespace *pid_ns) +{ + down_read(&pid_ns->rw_procfs_mnts); +} + +static inline void pidns_proc_unlock_shared(struct pid_namespace *pid_ns) +{ + up_read(&pid_ns->rw_procfs_mnts); +} +#else /* !CONFIG_PROC_FS */ + +static inline void pidns_proc_lock(struct pid_namespace *pid_ns) +{ +} + +static inline void pidns_proc_unlock(struct pid_namespace *pid_ns) +{ +} + +static inline void pidns_proc_lock_shared(struct pid_namespace *pid_ns) +{ +} + +static inline void pidns_proc_unlock_shared(struct pid_namespace *pid_ns) +{ +} + +#endif /* CONFIG_PROC_FS */ + #endif /* _LINUX_PID_NS_H */ diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h index 0fddb84..1af01c2 100644 --- a/include/linux/proc_fs.h +++ b/include/linux/proc_fs.h @@ -18,7 +18,9 @@ enum { /* definitions for proc mount option limit_pids */ }; struct proc_fs_info { + struct super_block *sb; struct pid_namespace *pid_ns; + struct list_head pidns_entry; /* Node in procfs_mounts of a pidns */ struct dentry *proc_self; /* For /proc/self */ struct dentry *proc_thread_self; /* For /proc/thread-self/ */ bool newinstance; /* Private flag for new separated instances */