From: Casey Schaufler <casey@schaufler-ca.com> To: casey.schaufler@intel.com, jmorris@namei.org, linux-security-module@vger.kernel.org, selinux@vger.kernel.org Cc: casey@schaufler-ca.com, keescook@chromium.org, john.johansen@canonical.com, penguin-kernel@i-love.sakura.ne.jp, paul@paul-moore.com, sds@tycho.nsa.gov, linux-audit@redhat.com, linux-integrity@vger.kernel.org Subject: [PATCH v17 10/23] LSM: Use lsmblob in security_inode_getsecid Date: Thu, 14 May 2020 15:11:29 -0700 [thread overview] Message-ID: <20200514221142.11857-11-casey@schaufler-ca.com> (raw) In-Reply-To: <20200514221142.11857-1-casey@schaufler-ca.com> Change the security_inode_getsecid() interface to fill in a lsmblob structure instead of a u32 secid. This allows for its callers to gather data from all registered LSMs. Data is provided for IMA and audit. Reviewed-by: Kees Cook <keescook@chromium.org> Reviewed-by: John Johansen <john.johansen@canonical.com> Signed-off-by: Casey Schaufler <casey@schaufler-ca.com> Acked-by: Stephen Smalley <sds@tycho.nsa.gov> cc: linux-integrity@vger.kernel.org --- include/linux/security.h | 7 ++++--- kernel/auditsc.c | 6 +++++- security/integrity/ima/ima_policy.c | 4 +--- security/security.c | 11 +++++++++-- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/include/linux/security.h b/include/linux/security.h index abb88a7727c4..c46da9c03162 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -431,7 +431,7 @@ int security_inode_killpriv(struct dentry *dentry); int security_inode_getsecurity(struct inode *inode, const char *name, void **buffer, bool alloc); int security_inode_setsecurity(struct inode *inode, const char *name, const void *value, size_t size, int flags); int security_inode_listsecurity(struct inode *inode, char *buffer, size_t buffer_size); -void security_inode_getsecid(struct inode *inode, u32 *secid); +void security_inode_getsecid(struct inode *inode, struct lsmblob *blob); int security_inode_copy_up(struct dentry *src, struct cred **new); int security_inode_copy_up_xattr(const char *name); int security_kernfs_init_security(struct kernfs_node *kn_dir, @@ -946,9 +946,10 @@ static inline int security_inode_listsecurity(struct inode *inode, char *buffer, return 0; } -static inline void security_inode_getsecid(struct inode *inode, u32 *secid) +static inline void security_inode_getsecid(struct inode *inode, + struct lsmblob *blob) { - *secid = 0; + lsmblob_init(blob, 0); } static inline int security_inode_copy_up(struct dentry *src, struct cred **new) diff --git a/kernel/auditsc.c b/kernel/auditsc.c index f4c45ec8f59f..3201f0997a5d 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c @@ -1935,13 +1935,17 @@ static void audit_copy_inode(struct audit_names *name, const struct dentry *dentry, struct inode *inode, unsigned int flags) { + struct lsmblob blob; + name->ino = inode->i_ino; name->dev = inode->i_sb->s_dev; name->mode = inode->i_mode; name->uid = inode->i_uid; name->gid = inode->i_gid; name->rdev = inode->i_rdev; - security_inode_getsecid(inode, &name->osid); + security_inode_getsecid(inode, &blob); + /* scaffolding until osid is updated */ + name->osid = blob.secid[0]; if (flags & AUDIT_INODE_NOEVAL) { name->fcap_ver = -1; return; diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c index 2c1a92cc1bf8..2f084a388142 100644 --- a/security/integrity/ima/ima_policy.c +++ b/security/integrity/ima/ima_policy.c @@ -479,7 +479,6 @@ static bool ima_match_rules(struct ima_rule_entry *rule, struct inode *inode, return false; for (i = 0; i < MAX_LSM_RULES; i++) { int rc = 0; - u32 osid; struct lsmblob lsmdata; if (!ima_lsm_isset(rule->lsm[i].rules)) { @@ -492,8 +491,7 @@ static bool ima_match_rules(struct ima_rule_entry *rule, struct inode *inode, case LSM_OBJ_USER: case LSM_OBJ_ROLE: case LSM_OBJ_TYPE: - security_inode_getsecid(inode, &osid); - lsmblob_init(&lsmdata, osid); + security_inode_getsecid(inode, &lsmdata); rc = security_filter_rule_match(&lsmdata, rule->lsm[i].type, Audit_equal, diff --git a/security/security.c b/security/security.c index 60b3d42b2e3b..1e8456a6fe3c 100644 --- a/security/security.c +++ b/security/security.c @@ -1437,9 +1437,16 @@ int security_inode_listsecurity(struct inode *inode, char *buffer, size_t buffer } EXPORT_SYMBOL(security_inode_listsecurity); -void security_inode_getsecid(struct inode *inode, u32 *secid) +void security_inode_getsecid(struct inode *inode, struct lsmblob *blob) { - call_void_hook(inode_getsecid, inode, secid); + struct security_hook_list *hp; + + lsmblob_init(blob, 0); + hlist_for_each_entry(hp, &security_hook_heads.inode_getsecid, list) { + if (WARN_ON(hp->lsmid->slot < 0 || hp->lsmid->slot >= lsm_slot)) + continue; + hp->hook.inode_getsecid(inode, &blob->secid[hp->lsmid->slot]); + } } int security_inode_copy_up(struct dentry *src, struct cred **new) -- 2.24.1
WARNING: multiple messages have this Message-ID (diff)
From: Casey Schaufler <casey@schaufler-ca.com> To: casey.schaufler@intel.com, jmorris@namei.org, linux-security-module@vger.kernel.org, selinux@vger.kernel.org Cc: john.johansen@canonical.com, linux-audit@redhat.com, linux-integrity@vger.kernel.org, sds@tycho.nsa.gov Subject: [PATCH v17 10/23] LSM: Use lsmblob in security_inode_getsecid Date: Thu, 14 May 2020 15:11:29 -0700 [thread overview] Message-ID: <20200514221142.11857-11-casey@schaufler-ca.com> (raw) In-Reply-To: <20200514221142.11857-1-casey@schaufler-ca.com> Change the security_inode_getsecid() interface to fill in a lsmblob structure instead of a u32 secid. This allows for its callers to gather data from all registered LSMs. Data is provided for IMA and audit. Reviewed-by: Kees Cook <keescook@chromium.org> Reviewed-by: John Johansen <john.johansen@canonical.com> Signed-off-by: Casey Schaufler <casey@schaufler-ca.com> Acked-by: Stephen Smalley <sds@tycho.nsa.gov> cc: linux-integrity@vger.kernel.org --- include/linux/security.h | 7 ++++--- kernel/auditsc.c | 6 +++++- security/integrity/ima/ima_policy.c | 4 +--- security/security.c | 11 +++++++++-- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/include/linux/security.h b/include/linux/security.h index abb88a7727c4..c46da9c03162 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -431,7 +431,7 @@ int security_inode_killpriv(struct dentry *dentry); int security_inode_getsecurity(struct inode *inode, const char *name, void **buffer, bool alloc); int security_inode_setsecurity(struct inode *inode, const char *name, const void *value, size_t size, int flags); int security_inode_listsecurity(struct inode *inode, char *buffer, size_t buffer_size); -void security_inode_getsecid(struct inode *inode, u32 *secid); +void security_inode_getsecid(struct inode *inode, struct lsmblob *blob); int security_inode_copy_up(struct dentry *src, struct cred **new); int security_inode_copy_up_xattr(const char *name); int security_kernfs_init_security(struct kernfs_node *kn_dir, @@ -946,9 +946,10 @@ static inline int security_inode_listsecurity(struct inode *inode, char *buffer, return 0; } -static inline void security_inode_getsecid(struct inode *inode, u32 *secid) +static inline void security_inode_getsecid(struct inode *inode, + struct lsmblob *blob) { - *secid = 0; + lsmblob_init(blob, 0); } static inline int security_inode_copy_up(struct dentry *src, struct cred **new) diff --git a/kernel/auditsc.c b/kernel/auditsc.c index f4c45ec8f59f..3201f0997a5d 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c @@ -1935,13 +1935,17 @@ static void audit_copy_inode(struct audit_names *name, const struct dentry *dentry, struct inode *inode, unsigned int flags) { + struct lsmblob blob; + name->ino = inode->i_ino; name->dev = inode->i_sb->s_dev; name->mode = inode->i_mode; name->uid = inode->i_uid; name->gid = inode->i_gid; name->rdev = inode->i_rdev; - security_inode_getsecid(inode, &name->osid); + security_inode_getsecid(inode, &blob); + /* scaffolding until osid is updated */ + name->osid = blob.secid[0]; if (flags & AUDIT_INODE_NOEVAL) { name->fcap_ver = -1; return; diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c index 2c1a92cc1bf8..2f084a388142 100644 --- a/security/integrity/ima/ima_policy.c +++ b/security/integrity/ima/ima_policy.c @@ -479,7 +479,6 @@ static bool ima_match_rules(struct ima_rule_entry *rule, struct inode *inode, return false; for (i = 0; i < MAX_LSM_RULES; i++) { int rc = 0; - u32 osid; struct lsmblob lsmdata; if (!ima_lsm_isset(rule->lsm[i].rules)) { @@ -492,8 +491,7 @@ static bool ima_match_rules(struct ima_rule_entry *rule, struct inode *inode, case LSM_OBJ_USER: case LSM_OBJ_ROLE: case LSM_OBJ_TYPE: - security_inode_getsecid(inode, &osid); - lsmblob_init(&lsmdata, osid); + security_inode_getsecid(inode, &lsmdata); rc = security_filter_rule_match(&lsmdata, rule->lsm[i].type, Audit_equal, diff --git a/security/security.c b/security/security.c index 60b3d42b2e3b..1e8456a6fe3c 100644 --- a/security/security.c +++ b/security/security.c @@ -1437,9 +1437,16 @@ int security_inode_listsecurity(struct inode *inode, char *buffer, size_t buffer } EXPORT_SYMBOL(security_inode_listsecurity); -void security_inode_getsecid(struct inode *inode, u32 *secid) +void security_inode_getsecid(struct inode *inode, struct lsmblob *blob) { - call_void_hook(inode_getsecid, inode, secid); + struct security_hook_list *hp; + + lsmblob_init(blob, 0); + hlist_for_each_entry(hp, &security_hook_heads.inode_getsecid, list) { + if (WARN_ON(hp->lsmid->slot < 0 || hp->lsmid->slot >= lsm_slot)) + continue; + hp->hook.inode_getsecid(inode, &blob->secid[hp->lsmid->slot]); + } } int security_inode_copy_up(struct dentry *src, struct cred **new) -- 2.24.1 -- Linux-audit mailing list Linux-audit@redhat.com https://www.redhat.com/mailman/listinfo/linux-audit
next prev parent reply other threads:[~2020-05-14 22:22 UTC|newest] Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <20200514221142.11857-1-casey.ref@schaufler-ca.com> 2020-05-14 22:11 ` [PATCH v17 00/23] LSM: Module stacking for AppArmor Casey Schaufler 2020-05-14 22:11 ` Casey Schaufler 2020-05-14 22:11 ` [PATCH v17 01/23] LSM: Infrastructure management of the sock security Casey Schaufler 2020-05-14 22:11 ` Casey Schaufler 2020-05-14 22:11 ` [PATCH v17 02/23] LSM: Create and manage the lsmblob data structure Casey Schaufler 2020-05-14 22:11 ` Casey Schaufler 2020-05-14 22:11 ` [PATCH v17 03/23] LSM: Use lsmblob in security_audit_rule_match Casey Schaufler 2020-05-14 22:11 ` Casey Schaufler 2020-05-14 22:11 ` [PATCH v17 04/23] LSM: Use lsmblob in security_kernel_act_as Casey Schaufler 2020-05-14 22:11 ` Casey Schaufler 2020-05-14 22:11 ` [PATCH v17 05/23] net: Prepare UDS for security module stacking Casey Schaufler 2020-05-14 22:11 ` Casey Schaufler 2020-05-18 17:02 ` Stephen Smalley 2020-05-18 17:02 ` Stephen Smalley 2020-05-14 22:11 ` [PATCH v17 06/23] Use lsmblob in security_secctx_to_secid Casey Schaufler 2020-05-14 22:11 ` Casey Schaufler 2020-05-14 22:11 ` [PATCH v17 07/23] LSM: Use lsmblob in security_secid_to_secctx Casey Schaufler 2020-05-14 22:11 ` Casey Schaufler 2020-05-14 22:11 ` [PATCH v17 08/23] LSM: Use lsmblob in security_ipc_getsecid Casey Schaufler 2020-05-14 22:11 ` Casey Schaufler 2020-05-14 22:11 ` [PATCH v17 09/23] LSM: Use lsmblob in security_task_getsecid Casey Schaufler 2020-05-14 22:11 ` Casey Schaufler 2020-05-14 22:11 ` Casey Schaufler [this message] 2020-05-14 22:11 ` [PATCH v17 10/23] LSM: Use lsmblob in security_inode_getsecid Casey Schaufler 2020-05-14 22:11 ` [PATCH v17 11/23] LSM: Use lsmblob in security_cred_getsecid Casey Schaufler 2020-05-14 22:11 ` Casey Schaufler 2020-05-14 22:11 ` [PATCH v17 12/23] IMA: Change internal interfaces to use lsmblobs Casey Schaufler 2020-05-14 22:11 ` Casey Schaufler 2020-05-14 22:11 ` [PATCH v17 13/23] LSM: Specify which LSM to display Casey Schaufler 2020-05-14 22:11 ` Casey Schaufler 2020-05-14 22:11 ` [PATCH v17 14/23] LSM: Ensure the correct LSM context releaser Casey Schaufler 2020-05-14 22:11 ` Casey Schaufler 2020-05-14 22:11 ` [PATCH v17 15/23] LSM: Use lsmcontext in security_secid_to_secctx Casey Schaufler 2020-05-14 22:11 ` Casey Schaufler 2020-05-14 22:11 ` [PATCH v17 16/23] LSM: Use lsmcontext in security_inode_getsecctx Casey Schaufler 2020-05-14 22:11 ` Casey Schaufler 2020-05-14 22:11 ` [PATCH v17 17/23] LSM: security_secid_to_secctx in netlink netfilter Casey Schaufler 2020-05-14 22:11 ` Casey Schaufler 2020-05-14 22:11 ` [PATCH v17 18/23] NET: Store LSM netlabel data in a lsmblob Casey Schaufler 2020-05-14 22:11 ` Casey Schaufler 2020-05-14 22:11 ` [PATCH v17 19/23] LSM: Verify LSM display sanity in binder Casey Schaufler 2020-05-14 22:11 ` Casey Schaufler 2020-05-14 22:11 ` [PATCH v17 20/23] Audit: Add a new record for multiple subject LSM attributes Casey Schaufler 2020-05-14 22:11 ` Casey Schaufler 2020-05-18 18:02 ` Stephen Smalley 2020-05-18 18:02 ` Stephen Smalley 2020-05-18 20:42 ` Casey Schaufler 2020-05-18 20:42 ` Casey Schaufler 2020-05-18 22:21 ` Paul Moore 2020-05-18 22:21 ` Paul Moore 2020-05-19 0:16 ` Casey Schaufler 2020-05-19 0:16 ` Casey Schaufler 2020-05-19 0:58 ` Casey Schaufler 2020-05-19 0:58 ` Casey Schaufler 2020-05-19 15:48 ` Paul Moore 2020-05-19 15:48 ` Paul Moore 2020-05-14 22:11 ` [PATCH v17 21/23] Audit: Add a new record for multiple object " Casey Schaufler 2020-05-14 22:11 ` Casey Schaufler 2020-05-14 22:11 ` [PATCH v17 22/23] LSM: Add /proc attr entry for full LSM context Casey Schaufler 2020-05-14 22:11 ` Casey Schaufler 2020-05-14 22:11 ` [PATCH v17 23/23] AppArmor: Remove the exclusive flag Casey Schaufler 2020-05-14 22:11 ` Casey Schaufler
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200514221142.11857-11-casey@schaufler-ca.com \ --to=casey@schaufler-ca.com \ --cc=casey.schaufler@intel.com \ --cc=jmorris@namei.org \ --cc=john.johansen@canonical.com \ --cc=keescook@chromium.org \ --cc=linux-audit@redhat.com \ --cc=linux-integrity@vger.kernel.org \ --cc=linux-security-module@vger.kernel.org \ --cc=paul@paul-moore.com \ --cc=penguin-kernel@i-love.sakura.ne.jp \ --cc=sds@tycho.nsa.gov \ --cc=selinux@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.