From patchwork Fri May 11 00:53:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Casey Schaufler X-Patchwork-Id: 10392763 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 D7A166028E for ; Fri, 11 May 2018 00:54:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C36F128D42 for ; Fri, 11 May 2018 00:54:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B80DC28D48; Fri, 11 May 2018 00:54:16 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable 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 4055328D4F for ; Fri, 11 May 2018 00:54:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752227AbeEKAxf (ORCPT ); Thu, 10 May 2018 20:53:35 -0400 Received: from sonic306-28.consmr.mail.ne1.yahoo.com ([66.163.189.90]:37978 "EHLO sonic306-28.consmr.mail.ne1.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751130AbeEKAxd (ORCPT ); Thu, 10 May 2018 20:53:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1526000013; bh=OaEUtROfk2l9e9Sh/zMG3AGWiP2R1C9b6C80DGM1BKI=; h=Subject:To:References:From:Date:In-Reply-To:From:Subject; b=RfigDzRkCAnC8ONd6QAI+WOoFyS7IXP0xNhkloVGJg8Nv3h7xASBbfsD29vT6L/kxMOdwT2XDvpMaiI9QGj3RpAt/qa7r5hqxSp7kFmk7U5E5O8mQMK4/YNoTCxihBMBtv8opyeX93eYTfq7uyXAsm0L3x7WAoz5yabEM3c3ViIsNFdDuKq4jB+qRhEJcFIRkfTwuLX28XoYO2G4LPtSWngpaSU8poWsSowKgY1YZYjj0DYbLXXEtGZYX/wPcAnB8h7LquIEHgab0hBB4ioUgL1TKZ8EDx8vlBtlVba8xoxMOhanVZtkowrdJ3MJ4OZjCDFFzYp+hbOIAW23AeTNHA== X-YMail-OSG: QeuJQUEVM1mzqQNufi2.1GNPenDiOh9AFgGp2wBIsfIu7wv5t51i4ZfHUcOXshR cryDX45sQ09u56tBtpz.WXJfVRyf5krDFYmmY33s1Oi7jAfkW82QmNFMyVtA.OZ69.7LmbSFtJco pd.HgR9Znqt9pOv4jSm6C8uLx32ML6RDxEk7ez.VYZfxfjHdCUg4GNt3ejM3F2mwCy_7aLrSZoHf k5Th2NgoqUXByqZhkC3vrs7.KaiNA5vAQWr3br_u335c84V3DfSid0Li.9sti8hof.sL.X_NQUNd biHti4Vhtqw2qT0I3wwGjM8c7_vzf5RUI11ZNJaxGF._ZjAqDMWC_ZOKVIqGOvi6ePLVYiv9D6_D Boql1_P1Q1lIwfVRL3_rw4aiMn1gD1YuQJAF3y_gaSrGFRR4FJV5BgnpeH8oJ5E2TkqX2Ow7ITkb aAOYFuUNoMrr1VaNP8JACkGZTPh8qNhHWWuOC.bHOCUBCBEBZtMuOUA0xvvSrARsQNnwFrYZZ.73 ffa.hU..177JRIEil5JrvsCyFqjzrE8KPWGFG9LSalvjDjlgV8a9rBE3fRZp5pw1Ss_d3wFGoxjS qLIX3rE1ise1n5nyDk6KTotJoywEuBiNewIMmZqrrTa1DA5RO8LfRCc_9COqjn5HVwqsCEqDNs6S 4KXM- Received: from sonic.gate.mail.ne1.yahoo.com by sonic306.consmr.mail.ne1.yahoo.com with HTTP; Fri, 11 May 2018 00:53:33 +0000 Received: from c-67-169-65-224.hsd1.ca.comcast.net (EHLO [192.168.0.105]) ([67.169.65.224]) by smtp420.mail.ne1.yahoo.com (Oath Hermes SMTP Server) with ESMTPA ID b26aaa1feffe3b27575fe78dd4c50219; Fri, 11 May 2018 00:53:31 +0000 (UTC) Subject: [PATCH 08/23] SELinux: Abstract use of inode security blob To: LSM , LKLM , Paul Moore , Stephen Smalley , SE Linux , "SMACK-discuss@lists.01.org" , John Johansen , Kees Cook , Tetsuo Handa , James Morris References: <7e8702ce-2598-e0a3-31a2-bc29157fb73d@schaufler-ca.com> From: Casey Schaufler Message-ID: <22bc0287-52b9-61c2-ab8d-f69f688d68fb@schaufler-ca.com> Date: Thu, 10 May 2018 17:53:28 -0700 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <7e8702ce-2598-e0a3-31a2-bc29157fb73d@schaufler-ca.com> Content-Language: en-US Sender: owner-linux-security-module@vger.kernel.org Precedence: bulk List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: Casey Schaufler Date: Thu, 10 May 2018 14:16:55 -0700 Subject: [PATCH 08/23] SELinux: Abstract use of inode security blob Don't use the inode->i_security pointer directly. Provide a helper function that provides the security blob pointer. Signed-off-by: Casey Schaufler --- security/selinux/hooks.c | 26 +++++++++++++------------- security/selinux/include/objsec.h | 5 +++++ security/selinux/selinuxfs.c | 4 ++-- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 334f47305551..baefd36b44df 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -277,7 +277,7 @@ static int __inode_security_revalidate(struct inode *inode, struct dentry *opt_dentry, bool may_sleep) { - struct inode_security_struct *isec = inode->i_security; + struct inode_security_struct *isec = selinux_inode(inode); might_sleep_if(may_sleep); @@ -298,7 +298,7 @@ static int __inode_security_revalidate(struct inode *inode, static struct inode_security_struct *inode_security_novalidate(struct inode *inode) { - return inode->i_security; + return selinux_inode(inode); } static struct inode_security_struct *inode_security_rcu(struct inode *inode, bool rcu) @@ -308,7 +308,7 @@ static struct inode_security_struct *inode_security_rcu(struct inode *inode, boo error = __inode_security_revalidate(inode, NULL, !rcu); if (error) return ERR_PTR(error); - return inode->i_security; + return selinux_inode(inode); } /* @@ -317,14 +317,14 @@ static struct inode_security_struct *inode_security_rcu(struct inode *inode, boo static struct inode_security_struct *inode_security(struct inode *inode) { __inode_security_revalidate(inode, NULL, true); - return inode->i_security; + return selinux_inode(inode); } static struct inode_security_struct *backing_inode_security_novalidate(struct dentry *dentry) { struct inode *inode = d_backing_inode(dentry); - return inode->i_security; + return selinux_inode(inode); } /* @@ -335,7 +335,7 @@ static struct inode_security_struct *backing_inode_security(struct dentry *dentr struct inode *inode = d_backing_inode(dentry); __inode_security_revalidate(inode, dentry, true); - return inode->i_security; + return selinux_inode(inode); } static void inode_free_rcu(struct rcu_head *head) @@ -348,7 +348,7 @@ static void inode_free_rcu(struct rcu_head *head) static void inode_free_security(struct inode *inode) { - struct inode_security_struct *isec = inode->i_security; + struct inode_security_struct *isec = selinux_inode(inode); struct superblock_security_struct *sbsec = inode->i_sb->s_security; /* @@ -1501,7 +1501,7 @@ static int selinux_genfs_get_sid(struct dentry *dentry, static int inode_doinit_with_dentry(struct inode *inode, struct dentry *opt_dentry) { struct superblock_security_struct *sbsec = NULL; - struct inode_security_struct *isec = inode->i_security; + struct inode_security_struct *isec = selinux_inode(inode); u32 task_sid, sid = 0; u16 sclass; struct dentry *dentry; @@ -1790,7 +1790,7 @@ static int inode_has_perm(const struct cred *cred, return 0; sid = cred_sid(cred); - isec = inode->i_security; + isec = selinux_inode(inode); return avc_has_perm(&selinux_state, sid, isec->sid, isec->sclass, perms, adp); @@ -3018,7 +3018,7 @@ static int selinux_inode_init_security(struct inode *inode, struct inode *dir, /* Possibly defer initialization to selinux_complete_init. */ if (sbsec->flags & SE_SBINITIALIZED) { - struct inode_security_struct *isec = inode->i_security; + struct inode_security_struct *isec = selinux_inode(inode); isec->sclass = inode_mode_to_security_class(inode->i_mode); isec->sid = newsid; isec->initialized = LABEL_INITIALIZED; @@ -3118,7 +3118,7 @@ static noinline int audit_inode_permission(struct inode *inode, unsigned flags) { struct common_audit_data ad; - struct inode_security_struct *isec = inode->i_security; + struct inode_security_struct *isec = selinux_inode(inode); int rc; ad.type = LSM_AUDIT_DATA_INODE; @@ -4124,7 +4124,7 @@ static int selinux_task_kill(struct task_struct *p, struct siginfo *info, static void selinux_task_to_inode(struct task_struct *p, struct inode *inode) { - struct inode_security_struct *isec = inode->i_security; + struct inode_security_struct *isec = selinux_inode(inode); u32 sid = task_sid(p); spin_lock(&isec->lock); @@ -6483,7 +6483,7 @@ static void selinux_release_secctx(char *secdata, u32 seclen) static void selinux_inode_invalidate_secctx(struct inode *inode) { - struct inode_security_struct *isec = inode->i_security; + struct inode_security_struct *isec = selinux_inode(inode); spin_lock(&isec->lock); isec->initialized = LABEL_INVALID; diff --git a/security/selinux/include/objsec.h b/security/selinux/include/objsec.h index 2586fbc7e38c..168a96104fa0 100644 --- a/security/selinux/include/objsec.h +++ b/security/selinux/include/objsec.h @@ -172,4 +172,9 @@ static inline struct file_security_struct *selinux_file(const struct file *file) return file->f_security; } +static inline struct inode_security_struct *selinux_inode(const struct inode *inode) +{ + return inode->i_security; +} + #endif /* _SELINUX_OBJSEC_H_ */ diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c index a1a389c09857..cbb270c9a3c1 100644 --- a/security/selinux/selinuxfs.c +++ b/security/selinux/selinuxfs.c @@ -1380,7 +1380,7 @@ static int sel_make_bools(struct selinux_fs_info *fsi) if (len >= PAGE_SIZE) goto out; - isec = (struct inode_security_struct *)inode->i_security; + isec = selinux_inode(inode); ret = security_genfs_sid(fsi->state, "selinuxfs", page, SECCLASS_FILE, &sid); if (ret) { @@ -1943,7 +1943,7 @@ static int sel_fill_super(struct super_block *sb, void *data, int silent) goto err; inode->i_ino = ++fsi->last_ino; - isec = (struct inode_security_struct *)inode->i_security; + isec = selinux_inode(inode); isec->sid = SECINITSID_DEVNULL; isec->sclass = SECCLASS_CHR_FILE; isec->initialized = LABEL_INITIALIZED;