From patchwork Mon Aug 10 21:05:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 6986171 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A143BC05AC for ; Mon, 10 Aug 2015 21:06:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CA7962078F for ; Mon, 10 Aug 2015 21:06:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C29802078D for ; Mon, 10 Aug 2015 21:06:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933268AbbHJVFt (ORCPT ); Mon, 10 Aug 2015 17:05:49 -0400 Received: from mail-ig0-f172.google.com ([209.85.213.172]:37875 "EHLO mail-ig0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933228AbbHJVFn (ORCPT ); Mon, 10 Aug 2015 17:05:43 -0400 Received: by igbpg9 with SMTP id pg9so78220522igb.0 for ; Mon, 10 Aug 2015 14:05:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=V5Mli11BJYIG31j0ZTnqFinwA09mGuIGjnSYtQ3js9w=; b=dFLSkNvbSI38gNWrvu8iZCFN3QpqgEHUyzDCOwc22tbL4Uit9Yj62XSMaxwtoSbiYT T+yNOJTLKm06y+18WLMjylJLNVPe3RtkKpfw/6pE00Qwpy5yJDqw3XdjiuC/ghZNofq5 anAB5RC9+3zSW4IFm7OxO6xqBK7DowRN/3ogwOTulFzbVxejCXhDr/Qq9gYHueZDcY2a 1/CsXyfgFnnupHq7XuDU9QfKGgGOFPwT9eT9BFcTDKjrg3/+Bsc/6/geJhFaihzY7EEG Zo7x74wHNRzBFOcrCHJzgZ4dD2cKpeXisrNbapWcj9ki+7MjyAbn22bmDyRVC9VOcnC8 r2LA== X-Gm-Message-State: ALoCoQnL8aGHGOLYoENRTIib808Iu/c1VExXrohh36V2EHEMZvnP2cW7N9Jx1l+27pz5HW7yYb9/ X-Received: by 10.50.78.98 with SMTP id a2mr10224406igx.87.1439240742105; Mon, 10 Aug 2015 14:05:42 -0700 (PDT) Received: from localhost (199-87-125-144.dyn.kc.surewest.net. [199.87.125.144]) by smtp.gmail.com with ESMTPSA id qd2sm26473igb.19.2015.08.10.14.05.41 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 10 Aug 2015 14:05:41 -0700 (PDT) From: Seth Forshee To: "Eric W. Biederman" , Alexander Viro , Serge Hallyn , James Morris , "Serge E. Hallyn" Cc: Andy Lutomirski , linux-fsdevel@vger.kernel.org, linux-security-module@vger.kernel.org, selinux@tycho.nsa.gov, linux-kernel@vger.kernel.org, linux-mtd@lists.infradead.org, Seth Forshee Subject: [PATCH v2 4/7] fs: Limit file caps to the user namespace of the super block Date: Mon, 10 Aug 2015 16:05:15 -0500 Message-Id: <1439240719-46850-5-git-send-email-seth.forshee@canonical.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1439240719-46850-1-git-send-email-seth.forshee@canonical.com> References: <1439240719-46850-1-git-send-email-seth.forshee@canonical.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Capability sets attached to files must be ignored except in the user namespaces where the mounter is privileged, i.e. s_user_ns and its descendants. Otherwise a vector exists for gaining privileges in namespaces where a user is not already privileged. Add a new helper function, in_user_ns(), to test whether a user namespace is the same as or a descendant of another namespace. Use this helper to determine whether a file's capability set should be applied to the caps constructed during exec. Acked-by: Serge Hallyn Signed-off-by: Seth Forshee --- include/linux/user_namespace.h | 8 ++++++++ kernel/user_namespace.c | 14 ++++++++++++++ security/commoncap.c | 2 ++ 3 files changed, 24 insertions(+) diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h index 8297e5b341d8..a43faa727124 100644 --- a/include/linux/user_namespace.h +++ b/include/linux/user_namespace.h @@ -72,6 +72,8 @@ extern ssize_t proc_projid_map_write(struct file *, const char __user *, size_t, extern ssize_t proc_setgroups_write(struct file *, const char __user *, size_t, loff_t *); extern int proc_setgroups_show(struct seq_file *m, void *v); extern bool userns_may_setgroups(const struct user_namespace *ns); +extern bool in_userns(const struct user_namespace *ns, + const struct user_namespace *target_ns); #else static inline struct user_namespace *get_user_ns(struct user_namespace *ns) @@ -100,6 +102,12 @@ static inline bool userns_may_setgroups(const struct user_namespace *ns) { return true; } + +static inline bool in_userns(const struct user_namespace *ns, + const struct user_namespace *target_ns) +{ + return true; +} #endif #endif /* _LINUX_USER_H */ diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c index 4109f8320684..2b043876d5f0 100644 --- a/kernel/user_namespace.c +++ b/kernel/user_namespace.c @@ -944,6 +944,20 @@ bool userns_may_setgroups(const struct user_namespace *ns) return allowed; } +/* + * Returns true if @ns is the same namespace as or a descendant of + * @target_ns. + */ +bool in_userns(const struct user_namespace *ns, + const struct user_namespace *target_ns) +{ + for (; ns; ns = ns->parent) { + if (ns == target_ns) + return true; + } + return false; +} + static inline struct user_namespace *to_user_ns(struct ns_common *ns) { return container_of(ns, struct user_namespace, ns); diff --git a/security/commoncap.c b/security/commoncap.c index d103f5a4043d..175ab497e810 100644 --- a/security/commoncap.c +++ b/security/commoncap.c @@ -439,6 +439,8 @@ static int get_file_caps(struct linux_binprm *bprm, bool *effective, bool *has_c if (bprm->file->f_path.mnt->mnt_flags & MNT_NOSUID) return 0; + if (!in_userns(current_user_ns(), bprm->file->f_path.mnt->mnt_sb->s_user_ns)) + return 0; rc = get_vfs_caps_from_disk(bprm->file->f_path.dentry, &vcaps); if (rc < 0) {