From patchwork Fri Feb 16 20:33:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Taras Kondratiuk X-Patchwork-Id: 128636 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp955727ljc; Fri, 16 Feb 2018 12:35:45 -0800 (PST) X-Google-Smtp-Source: AH8x225lU9empnPsW0DUQtzimHp72H8T3tRW58cQzWT2lJz48nV9feREAyeRf6yZXhnJ6+R5/Jff X-Received: by 10.99.110.199 with SMTP id j190mr5557186pgc.404.1518813345037; Fri, 16 Feb 2018 12:35:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518813345; cv=none; d=google.com; s=arc-20160816; b=tdzaTV0MtbgAVtZ4na30ytOePqkA68l/dB9/5DJib+EnArknM5i2ogmnwyKXBwdmJ5 adxTeuwmTyHAelaPdNCrD9jjr9hVInhEndN2Tcwkd8eaI4A/fs2YdegDmWceyaBDw0H+ 0/36G3psCUpuijYujRzcWRnarviVYxDuY1DBgQogoEaM73hW4c+LItbEWEG7KZLzenle sAFZar+UGd0r12oPhpMtT4ZTU4o7rkQRy3dRLDII/un31ZkdL1vvM61ItiN2sI5ur2IV Eap9Hn62IwKS7+xo3eKoA/Yg0zpu6dNsXPFaM/aYXv+w4OXTbmcQvVxJZZ7LEHz3K8Eo Ujxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=SHULkiKs1SdlOrYXBNOUNyCiEY09xiCEmePUGn79qF8=; b=HyBGU/7/ifvFWMaGNx4p3T2q1SGWBz9nbdFCx32SSi4e+IRYdKgVTbAg+mJjNHc3Md dMxwvNpcywfrVdeuCWMjXp294qBZzaVRbul54A2+lu3uU1Q8Uere5RWs58akf7g0d306 0JZ69F1SyOpa5dlID8iqVgZoTKPfDXcQoE8NHJm1/RaoZ60lcsimgOxiAgvqXHFHwMzi at696e860DBnw85KTNZ8gDmin8zavUR90I6cAe99owBoumWbj9BdZvGyNyHKVdCDLUxF muwNsXrKEkkIjUQaBGgq/PNsLeyL0EE6loi5wMt4BYHADH1yeQbiR1PUN5nNsRXyCsha q02w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cisco.com header.s=iport header.b=cOLZsB9N; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=cisco.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x3-v6si79308plo.2.2018.02.16.12.35.44; Fri, 16 Feb 2018 12:35:45 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@cisco.com header.s=iport header.b=cOLZsB9N; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=cisco.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751234AbeBPUfm (ORCPT + 28 others); Fri, 16 Feb 2018 15:35:42 -0500 Received: from alln-iport-6.cisco.com ([173.37.142.93]:35249 "EHLO alln-iport-6.cisco.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751091AbeBPUeL (ORCPT ); Fri, 16 Feb 2018 15:34:11 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cisco.com; i=@cisco.com; l=2865; q=dns/txt; s=iport; t=1518813251; x=1520022851; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=h+x182m25pAUhcejAUrzU53jlgUVrI0n67CYLEcHg4c=; b=cOLZsB9Nzw8q1/StuKYf0pbeaeCA2urCwUkBI0bmQwiqz/hi1LCQuP// 1S8uT9eWWL7JxhxiFsW1vABwSEOU7gefPIGE9KZzNROAxNTHY0pxBlQ16 jgxD0Ib718nbLqSjENqeNyQ7odDOfXJEl7q7ZMUdCKHpJXGbr8NxwBOGy k=; X-IronPort-AV: E=Sophos;i="5.46,520,1511827200"; d="scan'208";a="71375540" Received: from rcdn-core-6.cisco.com ([173.37.93.157]) by alln-iport-6.cisco.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 Feb 2018 20:34:09 +0000 Received: from sjc-ads-7132.cisco.com (sjc-ads-7132.cisco.com [10.30.217.207]) (authenticated bits=0) by rcdn-core-6.cisco.com (8.14.5/8.14.5) with ESMTP id w1GKXsMg015412 (version=TLSv1/SSLv3 cipher=AES128-SHA256 bits=128 verify=NO); Fri, 16 Feb 2018 20:34:08 GMT From: Taras Kondratiuk To: "H. Peter Anvin" , Al Viro , Arnd Bergmann , Rob Landley , Mimi Zohar , Jonathan Corbet , James McMechan Cc: initramfs@vger.kernel.org, Victor Kamensky , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-security-module@vger.kernel.org, xe-linux-external@cisco.com Subject: [PATCH v3 14/14] selinux: delay sid population for rootfs till init is complete Date: Fri, 16 Feb 2018 20:33:53 +0000 Message-Id: <1518813234-5874-18-git-send-email-takondra@cisco.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1518813234-5874-1-git-send-email-takondra@cisco.com> References: <1518813234-5874-1-git-send-email-takondra@cisco.com> X-Auto-Response-Suppress: DR, OOF, AutoReply X-Authenticated-User: takondra@cisco.com Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Victor Kamensky With initramfs cpio format that supports extended attributes we need to skip sid population on sys_lsetxattr call from initramfs for rootfs if security server is not initialized yet. Otherwise callback in selinux_inode_post_setxattr will try to translate give security.selinux label into sid context and since security server is not available yet inode will receive default sid (typically kernel_t). Note that in the same time proper label will be stored in inode xattrs. Later, since inode sid would be already populated system will never look back at actual xattrs. But if we skip sid population for rootfs and we have policy that direct use of xattrs for rootfs, proper sid will be filled in from extended attributes one node is accessed and server is initialized. Note new DELAYAFTERINIT_MNT super block flag is introduced to only mark rootfs for such behavior. For other types of tmpfs original logic is still used. Signed-off-by: Victor Kamensky --- security/selinux/hooks.c | 9 ++++++++- security/selinux/include/security.h | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) -- 2.10.3.dirty diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index f3fe65589f02..bb25268f734e 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -716,7 +716,7 @@ static int selinux_set_mnt_opts(struct super_block *sb, */ if (!strncmp(sb->s_type->name, "rootfs", sizeof("rootfs"))) - sbsec->flags |= SBLABEL_MNT; + sbsec->flags |= SBLABEL_MNT|DELAYAFTERINIT_MNT; /* Defer initialization until selinux_complete_init, after the initial policy is loaded and the security @@ -3253,6 +3253,7 @@ static void selinux_inode_post_setxattr(struct dentry *dentry, const char *name, { struct inode *inode = d_backing_inode(dentry); struct inode_security_struct *isec; + struct superblock_security_struct *sbsec; u32 newsid; int rc; @@ -3261,6 +3262,12 @@ static void selinux_inode_post_setxattr(struct dentry *dentry, const char *name, return; } + if (!ss_initialized) { + sbsec = inode->i_sb->s_security; + if (sbsec->flags & DELAYAFTERINIT_MNT) + return; + } + rc = security_context_to_sid_force(value, size, &newsid); if (rc) { printk(KERN_ERR "SELinux: unable to map context to SID" diff --git a/security/selinux/include/security.h b/security/selinux/include/security.h index 02f0412d42f2..585acfd6cbcf 100644 --- a/security/selinux/include/security.h +++ b/security/selinux/include/security.h @@ -52,6 +52,7 @@ #define ROOTCONTEXT_MNT 0x04 #define DEFCONTEXT_MNT 0x08 #define SBLABEL_MNT 0x10 +#define DELAYAFTERINIT_MNT 0x20 /* Non-mount related flags */ #define SE_SBINITIALIZED 0x0100 #define SE_SBPROC 0x0200