From patchwork Fri Nov 3 00:44:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mahesh Bandewar X-Patchwork-Id: 10039431 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 CDE0B6028E for ; Fri, 3 Nov 2017 00:45:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BDAF829463 for ; Fri, 3 Nov 2017 00:45:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B0A242946A; Fri, 3 Nov 2017 00:45:06 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from mother.openwall.net (mother.openwall.net [195.42.179.200]) by mail.wl.linuxfoundation.org (Postfix) with SMTP id 73D6E29463 for ; Fri, 3 Nov 2017 00:45:05 +0000 (UTC) Received: (qmail 20142 invoked by uid 550); 3 Nov 2017 00:44:55 -0000 Mailing-List: contact kernel-hardening-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Delivered-To: mailing list kernel-hardening@lists.openwall.com Received: (qmail 19820 invoked from network); 3 Nov 2017 00:44:51 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bandewar-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=B1cNzk4FVmFQFaDFccgZITjoOD3de9ZmjFOK/Kat6XQ=; b=pNemtZKGaQvdvGebUeisuWgpOngJ9efKbB5Geuhv0LLF9QfDkVx5YlYaCccvvn5yVB rfswVi8ISIfVWuu5US0hxlPU44Bxi05G7W1S0fi/EJ3cOL77EFBjr5Dl695tEBlv+Quz WV3O5f7gPfXJVqCjqLeLhCOahM9MfImAwBPBeXctgQ2f7kezyI4J0ElkyuNKP2eBlVyi F0mkGBT1I6dd6tyKwxNse6g4rmEjrx7ITFleGksG9BmKjtumgDCbw80009EmnIA7rd3w ICapfg+gpu+x1xJdFDg2NX723YAYum2pzl+vvIKYnlIutxk11l11xXLD1wpi62L1Th9o BDnw== 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; bh=B1cNzk4FVmFQFaDFccgZITjoOD3de9ZmjFOK/Kat6XQ=; b=KG8Qh3dCCnT+Rttz0E7RGOikxpIbdmkr5p+NWlV3bUY/qgOG11Jwi3R8FcP7s2oFSR plYtcRDQFp/eTk03cSHw8bvyyCp9XwNrG5mipa+fWjfypijUTRCwHDzoOi2oEp+ox0iT SjeOIc5lvswp0lvU7uw9jFi77nBIDuNnuzSyfyaB5GPli5htP+aetekPyqU5G5WhhNrf QqQaNkPNUsOBYQyanzveLZdmrd3UApjcJAP137K+4D29IEteDSOSJ72Lo+055m1IirXt gFLAEXeVw7jELFddqfiiNfACXQXjK6EY8Cno1bFUg3uPPVJl3E0XEbr919joa2IKpBxp DnZw== X-Gm-Message-State: AMCzsaWuhH/xttdJn540ZvdPOlF7Mh6cq+As70W42v+frE6egihLsVQM lWCdV0SnnEsF4cqTR7kqTTLrlA== X-Google-Smtp-Source: ABhQp+SwhtPvtJ78ODDR6mJQ+HmJb/i8FksL70T4oJ0w7QL1wLQDp05T5phClAAR8MIzAEm6z6JScw== X-Received: by 10.107.169.199 with SMTP id f68mr6707459ioj.162.1509669880175; Thu, 02 Nov 2017 17:44:40 -0700 (PDT) From: Mahesh Bandewar To: LKML , Netdev Cc: Kernel-hardening , Linux API , Kees Cook , Serge Hallyn , "Eric W . Biederman" , Eric Dumazet , David Miller , Mahesh Bandewar , Mahesh Bandewar Date: Thu, 2 Nov 2017 17:44:36 -0700 Message-Id: <20171103004436.40026-1-mahesh@bandewar.net> X-Mailer: git-send-email 2.15.0.403.gc27cc4dac6-goog Subject: [kernel-hardening] [PATCH resend 2/2] userns: control capabilities of some user namespaces X-Virus-Scanned: ClamAV using ClamSMTP From: Mahesh Bandewar With this new notion of "controlled" user-namespaces, the controlled user-namespaces are marked at the time of their creation while the capabilities of processes that belong to them are controlled using the global mask. Init-user-ns is always uncontrolled and a process that has SYS_ADMIN that belongs to uncontrolled user-ns can create another (child) user- namespace that is uncontrolled. Any other process (that either does not have SYS_ADMIN or belongs to a controlled user-ns) can only create a user-ns that is controlled. global-capability-whitelist (controlled_userns_caps_whitelist) is used at the capability check-time and keeps the semantics for the processes that belong to uncontrolled user-ns as it is. Processes that belong to controlled user-ns however are subjected to different checks- (a) if the capability in question is controlled and process belongs to controlled user-ns, then it's always denied. (b) if the capability in question is NOT controlled then fall back to the traditional check. Signed-off-by: Mahesh Bandewar --- include/linux/capability.h | 1 + include/linux/user_namespace.h | 20 ++++++++++++++++++++ kernel/capability.c | 5 +++++ kernel/user_namespace.c | 3 +++ security/commoncap.c | 8 ++++++++ 5 files changed, 37 insertions(+) diff --git a/include/linux/capability.h b/include/linux/capability.h index 6c0b9677c03f..b8c6cac18658 100644 --- a/include/linux/capability.h +++ b/include/linux/capability.h @@ -250,6 +250,7 @@ extern bool ptracer_capable(struct task_struct *tsk, struct user_namespace *ns); extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps); int proc_douserns_caps_whitelist(struct ctl_table *table, int write, void __user *buff, size_t *lenp, loff_t *ppos); +bool is_capability_controlled(int cap); extern int cap_convert_nscap(struct dentry *dentry, void **ivalue, size_t size); diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h index c18e01252346..e890fe81b47e 100644 --- a/include/linux/user_namespace.h +++ b/include/linux/user_namespace.h @@ -22,6 +22,7 @@ struct uid_gid_map { /* 64 bytes -- 1 cache line */ }; #define USERNS_SETGROUPS_ALLOWED 1UL +#define USERNS_CONTROLLED 2UL #define USERNS_INIT_FLAGS USERNS_SETGROUPS_ALLOWED @@ -102,6 +103,16 @@ static inline void put_user_ns(struct user_namespace *ns) __put_user_ns(ns); } +static inline bool is_user_ns_controlled(const struct user_namespace *ns) +{ + return ns->flags & USERNS_CONTROLLED; +} + +static inline void mark_user_ns_controlled(struct user_namespace *ns) +{ + ns->flags |= USERNS_CONTROLLED; +} + struct seq_operations; extern const struct seq_operations proc_uid_seq_operations; extern const struct seq_operations proc_gid_seq_operations; @@ -160,6 +171,15 @@ static inline struct ns_common *ns_get_owner(struct ns_common *ns) { return ERR_PTR(-EPERM); } + +static inline bool is_user_ns_controlled(const struct user_namespace *ns) +{ + return false; +} + +static inline void mark_user_ns_controlled(struct user_namespace *ns) +{ +} #endif #endif /* _LINUX_USER_H */ diff --git a/kernel/capability.c b/kernel/capability.c index 62dbe3350c1b..40a38cc4ff43 100644 --- a/kernel/capability.c +++ b/kernel/capability.c @@ -510,6 +510,11 @@ bool ptracer_capable(struct task_struct *tsk, struct user_namespace *ns) } /* Controlled-userns capabilities routines */ +bool is_capability_controlled(int cap) +{ + return !cap_raised(controlled_userns_caps_whitelist, cap); +} + #ifdef CONFIG_SYSCTL int proc_douserns_caps_whitelist(struct ctl_table *table, int write, void __user *buff, size_t *lenp, loff_t *ppos) diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c index c490f1e4313b..f393ea5108f0 100644 --- a/kernel/user_namespace.c +++ b/kernel/user_namespace.c @@ -53,6 +53,9 @@ static void set_cred_user_ns(struct cred *cred, struct user_namespace *user_ns) cred->cap_effective = CAP_FULL_SET; cred->cap_ambient = CAP_EMPTY_SET; cred->cap_bset = CAP_FULL_SET; + if (!ns_capable(user_ns->parent, CAP_SYS_ADMIN) || + is_user_ns_controlled(user_ns->parent)) + mark_user_ns_controlled(user_ns); #ifdef CONFIG_KEYS key_put(cred->request_key_auth); cred->request_key_auth = NULL; diff --git a/security/commoncap.c b/security/commoncap.c index fc46f5b85251..89103f16ac37 100644 --- a/security/commoncap.c +++ b/security/commoncap.c @@ -73,6 +73,14 @@ int cap_capable(const struct cred *cred, struct user_namespace *targ_ns, { struct user_namespace *ns = targ_ns; + /* If the capability is controlled and user-ns that process + * belongs-to is 'controlled' then return EPERM and no need + * to check the user-ns hierarchy. + */ + if (is_user_ns_controlled(cred->user_ns) && + is_capability_controlled(cap)) + return -EPERM; + /* See if cred has the capability in the target user namespace * by examining the target user namespace and all of the target * user namespace's parents.