[v38,16/39] LSM: Use lsmblob in security_ipc_getsecid

Message ID	20220927195421.14713-17-casey@schaufler-ca.com (mailing list archive)
State	Handled Elsewhere
Delegated to:	Paul Moore
Headers	show Return-Path: <selinux-owner@kernel.org> From: Casey Schaufler <casey@schaufler-ca.com> To: casey.schaufler@intel.com, paul@paul-moore.com, linux-security-module@vger.kernel.org Cc: casey@schaufler-ca.com, linux-audit@redhat.com, jmorris@namei.org, selinux@vger.kernel.org, keescook@chromium.org, john.johansen@canonical.com, penguin-kernel@i-love.sakura.ne.jp, stephen.smalley.work@gmail.com, linux-kernel@vger.kernel.org Subject: [PATCH v38 16/39] LSM: Use lsmblob in security_ipc_getsecid Date: Tue, 27 Sep 2022 12:53:58 -0700 Message-Id: <20220927195421.14713-17-casey@schaufler-ca.com> In-Reply-To: <20220927195421.14713-1-casey@schaufler-ca.com> References: <20220927195421.14713-1-casey@schaufler-ca.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	[v38,01/39] LSM: Identify modules by more than name \| expand [v38,01/39] LSM: Identify modules by more than name [v38,02/39] LSM: Add an LSM identifier for external use [v38,03/39] LSM: Identify the process attributes for each module [v38,04/39] LSM: Maintain a table of LSM attribute data [v38,05/39] proc: Use lsmids instead of lsm names for attrs [v38,06/39] LSM: lsm_self_attr syscall for LSM self attributes [v38,07/39] integrity: disassociate ima_filter_rule from security_audit_rule [v38,08/39] LSM: Infrastructure management of the sock security [v38,09/39] LSM: Add the lsmblob data structure. [v38,10/39] LSM: provide lsm name and id slot mappings [v38,11/39] IMA: avoid label collisions with stacked LSMs [v38,12/39] LSM: Use lsmblob in security_audit_rule_match [v38,13/39] LSM: Use lsmblob in security_kernel_act_as [v38,14/39] LSM: Use lsmblob in security_secctx_to_secid [v38,15/39] LSM: Use lsmblob in security_secid_to_secctx [v38,16/39] LSM: Use lsmblob in security_ipc_getsecid [v38,17/39] LSM: Use lsmblob in security_current_getsecid [v38,18/39] LSM: Use lsmblob in security_inode_getsecid [v38,19/39] LSM: Use lsmblob in security_cred_getsecid [v38,20/39] LSM: Specify which LSM to display [v38,21/39] LSM: Ensure the correct LSM context releaser [v38,22/39] LSM: Use lsmcontext in security_secid_to_secctx [v38,23/39] LSM: Use lsmcontext in security_inode_getsecctx [v38,24/39] Use lsmcontext in security_dentry_init_security [v38,25/39] LSM: security_secid_to_secctx in netlink netfilter [v38,26/39] NET: Store LSM netlabel data in a lsmblob [v38,27/39] binder: Pass LSM identifier for confirmation [v38,28/39] LSM: security_secid_to_secctx module selection [v38,29/39] Audit: Keep multiple LSM data in audit_names [v38,30/39] Audit: Create audit_stamp structure [v38,31/39] LSM: Add a function to report multiple LSMs [v38,32/39] Audit: Allow multiple records in an audit_buffer [v38,33/39] Audit: Add record for multiple task security contexts [v38,34/39] audit: multiple subject lsm values for netlabel [v38,35/39] Audit: Add record for multiple object contexts [v38,36/39] netlabel: Use a struct lsmblob in audit data [v38,37/39] LSM: Removed scaffolding function lsmcontext_init [v38,38/39] AppArmor: Remove the exclusive flag [v38,39/39] LSM: Create lsm_module_list system call

Message ID

20220927195421.14713-17-casey@schaufler-ca.com (mailing list archive)

State

Handled Elsewhere

Delegated to:

Paul Moore

Headers

From: Casey Schaufler <casey@schaufler-ca.com>
To: casey.schaufler@intel.com, paul@paul-moore.com,
        linux-security-module@vger.kernel.org
Cc: casey@schaufler-ca.com, linux-audit@redhat.com, jmorris@namei.org,
        selinux@vger.kernel.org, keescook@chromium.org,
        john.johansen@canonical.com, penguin-kernel@i-love.sakura.ne.jp,
        stephen.smalley.work@gmail.com, linux-kernel@vger.kernel.org
Subject: [PATCH v38 16/39] LSM: Use lsmblob in security_ipc_getsecid
Date: Tue, 27 Sep 2022 12:53:58 -0700
Message-Id: <20220927195421.14713-17-casey@schaufler-ca.com>
In-Reply-To: <20220927195421.14713-1-casey@schaufler-ca.com>
References: <20220927195421.14713-1-casey@schaufler-ca.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

[v38,01/39] LSM: Identify modules by more than name | expand

Commit Message

Casey Schaufler Sept. 27, 2022, 7:53 p.m. UTC

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 <keescook@chromium.org>
Reviewed-by: John Johansen <john.johansen@canonical.com>
Acked-by: Stephen Smalley <stephen.smalley.work@gmail.com>
Acked-by: Paul Moore <paul@paul-moore.com>
Signed-off-by: Casey Schaufler <casey@schaufler-ca.com>
Cc: linux-audit@redhat.com
---
 include/linux/security.h |  7 ++++---
 kernel/auditsc.c         |  7 ++++++-
 security/security.c      | 12 +++++++++---
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/include/linux/security.h b/include/linux/security.h
index d9ab76c909e0..bedb2047138b 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -541,7 +541,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);
@@ -1304,9 +1304,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 d083c050d660..9eb2d84439da 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -2643,12 +2643,17 @@  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);
+	/* context->ipc.osid will be changed to a lsmblob later in
+	 * the patch series. This will allow auditing of all the object
+	 * labels associated with the ipc object. */
+	context->ipc.osid = lsmblob_value(&blob);
 	context->type = AUDIT_IPC;
 }
 
diff --git a/security/security.c b/security/security.c
index 9c49406e5ff9..afd6f6698fd7 100644
--- a/security/security.c
+++ b/security/security.c
@@ -2030,10 +2030,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)

[v38,16/39] LSM: Use lsmblob in security_ipc_getsecid

Commit Message

Patch