[PATCH v22 09/23] LSM: Use lsmblob in security_inode_getsecid

STALE2154d REVIEWED: 8 (6M)

From: Casey Schaufler <casey@schaufler-ca.com>
Date: 2020-11-04 23:52:52
Also in: linux-integrity, lkml, selinux
Subsystem: audit subsystem, extended verification module (evm), integrity measurement architecture (ima), security subsystem, the rest · Maintainers: Paul Moore, Eric Paris, Mimi Zohar, Roberto Sassu, Dmitry Kasatkin, James Morris, "Serge E. Hallyn", Linus Torvalds

Revision v22 of 49 in this series; 4 review trailers (1 from subsystem maintainers).

Revisions (49)

2019-04-09 v1 [diff vs current]
2019-04-09 v1 [diff vs current]
2019-04-09 v1 [diff vs current]
2019-05-31 v1 [diff vs current]
2019-05-31 v1 [diff vs current]
2019-06-02 v1 [diff vs current]
2019-06-18 v2 [diff vs current]
2019-06-21 v3 [diff vs current]
2019-06-24 v3 [diff vs current]
2019-06-26 v4 [diff vs current]
2019-07-03 v5 [diff vs current]
2019-07-26 v5 [diff vs current]
2019-08-07 v7 [diff vs current]
2019-08-29 v8 [diff vs current]
2019-10-24 v10 [diff vs current]
2019-11-13 v10 [diff vs current]
2019-11-13 v11 [diff vs current]
2019-11-13 v11 [diff vs current]
2019-11-13 v11 [diff vs current]
2019-11-19 v11 [diff vs current]
2019-11-19 v11 [diff vs current]
2019-11-27 v11 [diff vs current]
2019-12-16 v12 [diff vs current]
2019-12-16 v12 [diff vs current]
2019-12-16 v12 [diff vs current]
2019-12-24 v12 [diff vs current]
2019-12-25 v13 [diff vs current]
2020-01-24 v14 [diff vs current]
2020-02-14 v15 [diff vs current]
2020-04-07 v16 [diff vs current]
2020-11-04 v22 current
2020-11-05 v22 [diff vs current]
2020-11-20 v22 [diff vs current]
2021-01-27 v24 [diff vs current]
2021-03-09 v25 [diff vs current]
2021-05-13 v26 [diff vs current]
2021-06-11 v27 [diff vs current]
2021-07-22 v28 [diff vs current]
2021-09-24 v29 [diff vs current]
2021-11-24 v30 [diff vs current]
2021-12-13 v31 [diff vs current]
2022-02-03 v32 [diff vs current]
2022-03-10 v33 [diff vs current]
2022-04-07 v34 [diff vs current]
2022-04-15 v34 [diff vs current]
2022-04-18 v35 [diff vs current]
2022-06-09 v36 [diff vs current]
2022-06-28 v37 [diff vs current]
2022-09-27 v38 [diff vs current]

Possibly related (same subject, not in this thread)

2020-11-05 · [PATCH v22 09/23] LSM: Use lsmblob in security_inode_getsecid · Casey Schaufler <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 <redacted>
Reviewed-by: John Johansen <john.johansen@canonical.com>
Acked-by: Stephen Smalley <redacted>
Acked-by: Paul Moore <paul@paul-moore.com>
Signed-off-by: Casey Schaufler <casey@schaufler-ca.com>
Cc: linux-integrity@vger.kernel.org
Cc: linux-audit@redhat.com
---
 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 6b9e3571960d..a7968dde27c6 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h

@@ -436,7 +436,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,

@@ -963,9 +963,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 8916a13406c3..b58b0048702a 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c

@@ -1980,13 +1980,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 3e47cc9b7400..bbf9fa79740a 100644
--- a/security/integrity/ima/ima_policy.c
+++ b/security/integrity/ima/ima_policy.c

@@ -561,7 +561,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)) {

@@ -574,8 +573,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 = ima_filter_rule_match(&lsmdata, rule->lsm[i].type,
 						   Audit_equal,
 						   rule->lsm[i].rules);

diff --git a/security/security.c b/security/security.c
index 421ff85015da..f3f6caae392f 100644
--- a/security/security.c
+++ b/security/security.c

@@ -1443,9 +1443,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

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help