From patchwork Wed Jan 9 16:28:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ondrej Mosnacek X-Patchwork-Id: 10754471 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 49D0B14E5 for ; Wed, 9 Jan 2019 16:29:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 362CD292CD for ; Wed, 9 Jan 2019 16:29:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2A504292CF; Wed, 9 Jan 2019 16:29:01 +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.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI 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 90529292D8 for ; Wed, 9 Jan 2019 16:29:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726254AbfAIQ24 (ORCPT ); Wed, 9 Jan 2019 11:28:56 -0500 Received: from mail-wr1-f65.google.com ([209.85.221.65]:39516 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726227AbfAIQ24 (ORCPT ); Wed, 9 Jan 2019 11:28:56 -0500 Received: by mail-wr1-f65.google.com with SMTP id t27so8295065wra.6 for ; Wed, 09 Jan 2019 08:28:53 -0800 (PST) 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:mime-version:content-transfer-encoding; bh=fRDDqmr3Vwt5yZVlqcMbm6I6d7BK2hVZRky0qELkXvU=; b=ACgnqTfBVy5qmx35rSwD3br2N090vuUwRUCYUVGSfs04EA8vzx+2sMVCo8EQduGvx+ jP8n+hQD6jQFbK/lTeC5gwlpD8vjcBXmAr0QM0194A31YTa28BbleTbLCeolHgj3Ihx0 mZTFIcVRdOovn6j76fRGPP5YtTgDs3tRv8bDwVkSTM1VpN3ESXI5+7hkF+ZLaROfxsKM U6Kk5J0XEh4h39NCGxGIIdoj7SPXZsPjOyOv3aDYTacNC/aRX9BNgMlDthoeBxh/gCR0 68KO3J1w4Cvmy7TlZvX3c2gGi/wpU4PoYX4d96doQ3s5WqAlc3m8fH0Csne5qvbm4Zq2 6v3g== X-Gm-Message-State: AJcUuketrA8yNBNScIB90G7fPHnPCoVyyGn2hj2fGo8peacPC1DmK0VD VCzKcMSiQNKSSjGruRZ8SpYeOw== X-Google-Smtp-Source: ALg8bN5socWIWRP3eTHOqxhvYBqZihCXAong9TjQcm79TqyuN8r/u/HPX4Pe0aCXwlxJxBQTR1tqhw== X-Received: by 2002:adf:f009:: with SMTP id j9mr5565083wro.170.1547051333255; Wed, 09 Jan 2019 08:28:53 -0800 (PST) Received: from localhost.localdomain.com (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id a17sm13661438wma.15.2019.01.09.08.28.52 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Jan 2019 08:28:52 -0800 (PST) From: Ondrej Mosnacek To: selinux@vger.kernel.org, Paul Moore Cc: Stephen Smalley , linux-security-module@vger.kernel.org, Greg Kroah-Hartman , Tejun Heo , linux-fsdevel@vger.kernel.org, cgroups@vger.kernel.org, Ondrej Mosnacek Subject: [PATCH v2 3/3] kernfs: Initialize security of newly created nodes Date: Wed, 9 Jan 2019 17:28:30 +0100 Message-Id: <20190109162830.8309-4-omosnace@redhat.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190109162830.8309-1-omosnace@redhat.com> References: <20190109162830.8309-1-omosnace@redhat.com> MIME-Version: 1.0 Sender: owner-linux-security-module@vger.kernel.org Precedence: bulk List-ID: X-Virus-Scanned: ClamAV using ClamSMTP Use the new security_object_init_security() hook to allow LSMs to possibly assign a non-default security context to newly created nodes based on the context of their parent node. This fixes an issue with cgroupfs under SELinux, where newly created cgroup subdirectories would not inherit its parent's context if it had been set explicitly to a non-default value (other than the genfs context specified by the policy). This can be reproduced as follows: # mkdir /sys/fs/cgroup/unified/test # chcon -R system_u:object_r:cgroup_t:s0:c123 /sys/fs/cgroup/unified/test # ls -lZ /sys/fs/cgroup/unified total 0 -r--r--r--. 1 root root system_u:object_r:cgroup_t:s0 0 Jan 8 05:00 cgroup.controllers -rw-r--r--. 1 root root system_u:object_r:cgroup_t:s0 0 Jan 8 05:00 cgroup.max.depth -rw-r--r--. 1 root root system_u:object_r:cgroup_t:s0 0 Jan 8 05:00 cgroup.max.descendants -rw-r--r--. 1 root root system_u:object_r:cgroup_t:s0 0 Jan 8 05:00 cgroup.procs -r--r--r--. 1 root root system_u:object_r:cgroup_t:s0 0 Jan 8 05:00 cgroup.stat -rw-r--r--. 1 root root system_u:object_r:cgroup_t:s0 0 Jan 8 05:00 cgroup.subtree_control -rw-r--r--. 1 root root system_u:object_r:cgroup_t:s0 0 Jan 8 05:00 cgroup.threads drwxr-xr-x. 2 root root system_u:object_r:cgroup_t:s0 0 Jan 8 04:54 init.scope drwxr-xr-x. 25 root root system_u:object_r:cgroup_t:s0 0 Jan 8 04:54 system.slice drwxr-xr-x. 2 root root system_u:object_r:cgroup_t:s0:c123 0 Jan 8 04:59 test drwxr-xr-x. 3 root root system_u:object_r:cgroup_t:s0 0 Jan 8 04:55 user.slice # mkdir /sys/fs/cgroup/unified/test/subdir Actual result: # ls -ldZ /sys/fs/cgroup/unified/test/subdir drwxr-xr-x. 2 root root system_u:object_r:cgroup_t:s0 0 Jan 8 05:10 /sys/fs/cgroup/unified/test/subdir Expected result: # ls -ldZ /sys/fs/cgroup/unified/test/subdir drwxr-xr-x. 2 root root unconfined_u:object_r:cgroup_t:s0:c123 0 Jan 8 05:10 /sys/fs/cgroup/unified/test/subdir Link: https://github.com/SELinuxProject/selinux-kernel/issues/39 Signed-off-by: Ondrej Mosnacek Reviewed-by: Stephen Smalley --- fs/kernfs/dir.c | 49 ++++++++++++++++++++++++++++++++++--- fs/kernfs/inode.c | 9 +++---- fs/kernfs/kernfs-internal.h | 4 +++ 3 files changed, 54 insertions(+), 8 deletions(-) diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c index 4ca0b5c18192..8a678a934f65 100644 --- a/fs/kernfs/dir.c +++ b/fs/kernfs/dir.c @@ -15,6 +15,7 @@ #include #include #include +#include #include "kernfs-internal.h" @@ -617,7 +618,43 @@ struct kernfs_node *kernfs_node_from_dentry(struct dentry *dentry) return NULL; } -static struct kernfs_node *__kernfs_new_node(struct kernfs_root *root, +static int kernfs_node_init_security(struct kernfs_node *parent, + struct kernfs_node *kn, umode_t mode) +{ + struct kernfs_iattrs *attrs; + struct qstr q; + void *ctx; + u32 ctxlen; + int ret; + + /* If parent has no explicit context set, leave child unset as well */ + if (!parent->iattr) + return 0; + if (!parent->iattr->ia_secdata || !parent->iattr->ia_secdata_len) + return 0; + + q.name = kn->name; + q.hash_len = hashlen_string(parent, kn->name); + + ret = security_object_init_security(parent->iattr->ia_secdata, + parent->iattr->ia_secdata_len, + &q, (u16)mode, &ctx, &ctxlen); + if (ret) + return ret; + + attrs = kernfs_iattrs(kn); + if (!attrs) { + security_release_secctx(ctx, ctxlen); + return -ENOMEM; + } + + kernfs_node_setsecdata(attrs, &ctx, &ctxlen); + /* The inode is fresh, so the returned ctx is always NULL. */ + return 0; +} + +static struct kernfs_node *__kernfs_new_node(struct kernfs_node *parent, + struct kernfs_root *root, const char *name, umode_t mode, kuid_t uid, kgid_t gid, unsigned flags) @@ -674,6 +711,12 @@ static struct kernfs_node *__kernfs_new_node(struct kernfs_root *root, goto err_out3; } + if (parent) { + ret = kernfs_node_init_security(parent, kn, mode); + if (ret) + goto err_out3; + } + return kn; err_out3: @@ -692,7 +735,7 @@ struct kernfs_node *kernfs_new_node(struct kernfs_node *parent, { struct kernfs_node *kn; - kn = __kernfs_new_node(kernfs_root(parent), + kn = __kernfs_new_node(parent, kernfs_root(parent), name, mode, uid, gid, flags); if (kn) { kernfs_get(parent); @@ -962,7 +1005,7 @@ struct kernfs_root *kernfs_create_root(struct kernfs_syscall_ops *scops, INIT_LIST_HEAD(&root->supers); root->next_generation = 1; - kn = __kernfs_new_node(root, "", S_IFDIR | S_IRUGO | S_IXUGO, + kn = __kernfs_new_node(NULL, root, "", S_IFDIR | S_IRUGO | S_IXUGO, GLOBAL_ROOT_UID, GLOBAL_ROOT_GID, KERNFS_DIR); if (!kn) { diff --git a/fs/kernfs/inode.c b/fs/kernfs/inode.c index 80cebcd94c90..e6db8d23437b 100644 --- a/fs/kernfs/inode.c +++ b/fs/kernfs/inode.c @@ -31,7 +31,7 @@ static const struct inode_operations kernfs_iops = { .listxattr = kernfs_iop_listxattr, }; -static struct kernfs_iattrs *kernfs_iattrs(struct kernfs_node *kn) +struct kernfs_iattrs *kernfs_iattrs(struct kernfs_node *kn) { static DEFINE_MUTEX(iattr_mutex); struct kernfs_iattrs *ret; @@ -135,8 +135,8 @@ out: return error; } -static int kernfs_node_setsecdata(struct kernfs_iattrs *attrs, void **secdata, - u32 *secdata_len) +void kernfs_node_setsecdata(struct kernfs_iattrs *attrs, void **secdata, + u32 *secdata_len) { void *old_secdata; size_t old_secdata_len; @@ -149,7 +149,6 @@ static int kernfs_node_setsecdata(struct kernfs_iattrs *attrs, void **secdata, *secdata = old_secdata; *secdata_len = old_secdata_len; - return 0; } ssize_t kernfs_iop_listxattr(struct dentry *dentry, char *buf, size_t size) @@ -365,7 +364,7 @@ static int kernfs_security_xattr_set(const struct xattr_handler *handler, return error; mutex_lock(&kernfs_mutex); - error = kernfs_node_setsecdata(attrs, &secdata, &secdata_len); + kernfs_node_setsecdata(attrs, &secdata, &secdata_len); mutex_unlock(&kernfs_mutex); if (secdata) diff --git a/fs/kernfs/kernfs-internal.h b/fs/kernfs/kernfs-internal.h index 3d83b114bb08..f6fb2df24c30 100644 --- a/fs/kernfs/kernfs-internal.h +++ b/fs/kernfs/kernfs-internal.h @@ -92,6 +92,10 @@ int kernfs_iop_getattr(const struct path *path, struct kstat *stat, ssize_t kernfs_iop_listxattr(struct dentry *dentry, char *buf, size_t size); int __kernfs_setattr(struct kernfs_node *kn, const struct iattr *iattr); +struct kernfs_iattrs *kernfs_iattrs(struct kernfs_node *kn); +void kernfs_node_setsecdata(struct kernfs_iattrs *attrs, void **secdata, + u32 *secdata_len); + /* * dir.c */