[PATCH v11 08/25] LSM: Use lsmblob in security_ipc_getsecid

STALE2507d REVIEWED: 2 (1M)

From: Casey Schaufler <casey@schaufler-ca.com>
Date: 2019-11-13 17:58:06
Also in: selinux
Subsystem: audit subsystem, security subsystem, the rest · Maintainers: Paul Moore, Eric Paris, James Morris, "Serge E. Hallyn", Linus Torvalds

Revision v11 of 54 in this series; 2 review trailers.

Revisions (54)

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 v10 [diff vs current]
2019-11-13 v11 [diff vs current]
2019-11-13 v11 current
2019-11-13 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-06 v15 [diff vs current]
2020-04-06 v15 [diff vs current]
2020-04-06 v15 [diff vs current]
2020-04-07 v16 [diff vs current]
2020-05-14 v17 [diff vs current]
2020-07-09 v18 [diff vs current]
2020-07-24 v19 [diff vs current]
2020-08-26 v20 [diff vs current]
2020-11-04 v22 [diff vs 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)

2019-11-21 · Re: [PATCH v11 08/25] LSM: Use lsmblob in security_ipc_getsecid · John Johansen <john.johansen@canonical.com>
2019-11-13 · [PATCH v11 08/25] LSM: Use lsmblob in security_ipc_getsecid · Casey Schaufler <casey@schaufler-ca.com>
2019-11-13 · [PATCH v11 08/25] LSM: Use lsmblob in security_ipc_getsecid · Casey Schaufler <casey@schaufler-ca.com>

There may be more than one LSM that provides IPC data
for auditing. Change security_ipc_getsecid() to fill in
a lsmblob structure instead of the u32 secid. The
audit data structure containing the secid will be updated
later, so there is a bit of scaffolding here.

Reviewed-by: Kees Cook <redacted>
Reviewed-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: Casey Schaufler <casey@schaufler-ca.com>
---
 include/linux/security.h |  7 ++++---
 kernel/auditsc.c         |  5 ++++-
 security/security.c      | 12 +++++++++---
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/include/linux/security.h b/include/linux/security.h
index a3e99bccb1bb..9519b4fb43ae 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h

@@ -464,7 +464,7 @@ int security_task_prctl(int option, unsigned long arg2, unsigned long arg3,
 			unsigned long arg4, unsigned long arg5);
 void security_task_to_inode(struct task_struct *p, struct inode *inode);
 int security_ipc_permission(struct kern_ipc_perm *ipcp, short flag);
-void security_ipc_getsecid(struct kern_ipc_perm *ipcp, u32 *secid);
+void security_ipc_getsecid(struct kern_ipc_perm *ipcp, struct lsmblob *blob);
 int security_msg_msg_alloc(struct msg_msg *msg);
 void security_msg_msg_free(struct msg_msg *msg);
 int security_msg_queue_alloc(struct kern_ipc_perm *msq);

@@ -1172,9 +1172,10 @@ static inline int security_ipc_permission(struct kern_ipc_perm *ipcp,
 	return 0;
 }
 
-static inline void security_ipc_getsecid(struct kern_ipc_perm *ipcp, u32 *secid)
+static inline void security_ipc_getsecid(struct kern_ipc_perm *ipcp,
+					 struct lsmblob *blob)
 {
-	*secid = 0;
+	lsmblob_init(blob, 0);
 }
 
 static inline int security_msg_msg_alloc(struct msg_msg *msg)

diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 04803c3099b2..ce8bf2d8f8d2 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c

@@ -2285,11 +2285,14 @@ void __audit_mq_getsetattr(mqd_t mqdes, struct mq_attr *mqstat)
 void __audit_ipc_obj(struct kern_ipc_perm *ipcp)
 {
 	struct audit_context *context = audit_context();
+	struct lsmblob blob;
 	context->ipc.uid = ipcp->uid;
 	context->ipc.gid = ipcp->gid;
 	context->ipc.mode = ipcp->mode;
 	context->ipc.has_perm = 0;
-	security_ipc_getsecid(ipcp, &context->ipc.osid);
+	security_ipc_getsecid(ipcp, &blob);
+	/* scaffolding on the [0] - change "osid" to a lsmblob */
+	context->ipc.osid = blob.secid[0];
 	context->type = AUDIT_IPC;
 }

diff --git a/security/security.c b/security/security.c
index 0fc75a31a6bb..b60c6a51f622 100644
--- a/security/security.c
+++ b/security/security.c

@@ -1783,10 +1783,16 @@ int security_ipc_permission(struct kern_ipc_perm *ipcp, short flag)
 	return call_int_hook(ipc_permission, 0, ipcp, flag);
 }
 
-void security_ipc_getsecid(struct kern_ipc_perm *ipcp, u32 *secid)
+void security_ipc_getsecid(struct kern_ipc_perm *ipcp, struct lsmblob *blob)
 {
-	*secid = 0;
-	call_void_hook(ipc_getsecid, ipcp, secid);
+	struct security_hook_list *hp;
+
+	lsmblob_init(blob, 0);
+	hlist_for_each_entry(hp, &security_hook_heads.ipc_getsecid, list) {
+		if (WARN_ON(hp->lsmid->slot < 0 || hp->lsmid->slot >= lsm_slot))
+			continue;
+		hp->hook.ipc_getsecid(ipcp, &blob->secid[hp->lsmid->slot]);
+	}
 }
 
 int security_msg_msg_alloc(struct msg_msg *msg)

-- 
2.20.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