[v37,23/33] Audit: Keep multiple LSM data in audit_names

Message ID	20220628005611.13106-24-casey@schaufler-ca.com (mailing list archive)
State	Superseded
Delegated to:	Paul Moore
Headers	show Return-Path: <linux-security-module-owner@kernel.org> 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, linux-audit@redhat.com, keescook@chromium.org, john.johansen@canonical.com, penguin-kernel@i-love.sakura.ne.jp, paul@paul-moore.com, stephen.smalley.work@gmail.com, linux-kernel@vger.kernel.org Subject: [PATCH v37 23/33] Audit: Keep multiple LSM data in audit_names Date: Mon, 27 Jun 2022 17:56:01 -0700 Message-Id: <20220628005611.13106-24-casey@schaufler-ca.com> In-Reply-To: <20220628005611.13106-1-casey@schaufler-ca.com> References: <20220628005611.13106-1-casey@schaufler-ca.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	LSM: Module stacking for AppArmor \| expand [v37,00/33] LSM: Module stacking for AppArmor [v37,01/33] integrity: disassociate ima_filter_rule from security_audit_rule [v37,02/33] LSM: Infrastructure management of the sock security [v37,03/33] LSM: Add the lsmblob data structure. [v37,04/33] LSM: provide lsm name and id slot mappings [v37,05/33] IMA: avoid label collisions with stacked LSMs [v37,06/33] LSM: Use lsmblob in security_audit_rule_match [v37,07/33] LSM: Use lsmblob in security_kernel_act_as [v37,08/33] LSM: Use lsmblob in security_secctx_to_secid [v37,09/33] LSM: Use lsmblob in security_secid_to_secctx [v37,10/33] LSM: Use lsmblob in security_ipc_getsecid [v37,11/33] LSM: Use lsmblob in security_current_getsecid [v37,12/33] LSM: Use lsmblob in security_inode_getsecid [v37,13/33] LSM: Use lsmblob in security_cred_getsecid [v37,14/33] LSM: Specify which LSM to display [v37,15/33] LSM: Ensure the correct LSM context releaser [v37,16/33] LSM: Use lsmcontext in security_secid_to_secctx [v37,17/33] LSM: Use lsmcontext in security_inode_getsecctx [v37,18/33] LSM: Use lsmcontext in security_dentry_init_security [v37,19/33] LSM: security_secid_to_secctx in netlink netfilter [v37,20/33] NET: Store LSM netlabel data in a lsmblob [v37,21/33] binder: Pass LSM identifier for confirmation [v37,22/33] LSM: security_secid_to_secctx module selection [v37,23/33] Audit: Keep multiple LSM data in audit_names [v37,24/33] Audit: Create audit_stamp structure [v37,25/33] LSM: Add a function to report multiple LSMs [v37,26/33] Audit: Allow multiple records in an audit_buffer [v37,27/33] Audit: Add record for multiple task security contexts [v37,28/33] audit: multiple subject lsm values for netlabel [v37,29/33] Audit: Add record for multiple object contexts [v37,30/33] netlabel: Use a struct lsmblob in audit data [v37,31/33] LSM: Removed scaffolding function lsmcontext_init [v37,32/33] LSM: Add /proc attr entry for full LSM context [v37,33/33] AppArmor: Remove the exclusive flag

Message ID

20220628005611.13106-24-casey@schaufler-ca.com (mailing list archive)

State

Superseded

Delegated to:

Paul Moore

Headers

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, linux-audit@redhat.com,
        keescook@chromium.org, john.johansen@canonical.com,
        penguin-kernel@i-love.sakura.ne.jp, paul@paul-moore.com,
        stephen.smalley.work@gmail.com, linux-kernel@vger.kernel.org
Subject: [PATCH v37 23/33] Audit: Keep multiple LSM data in audit_names
Date: Mon, 27 Jun 2022 17:56:01 -0700
Message-Id: <20220628005611.13106-24-casey@schaufler-ca.com>
In-Reply-To: <20220628005611.13106-1-casey@schaufler-ca.com>
References: <20220628005611.13106-1-casey@schaufler-ca.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

LSM: Module stacking for AppArmor | expand

Commit Message

Casey Schaufler June 28, 2022, 12:56 a.m. UTC

Replace the osid field in the audit_names structure
with a lsmblob structure. This accommodates the use
of an lsmblob in security_audit_rule_match() and
security_inode_getsecid().

Signed-off-by: Casey Schaufler <casey@schaufler-ca.com>
Acked-by: Paul Moore <paul@paul-moore.com>
---
 kernel/audit.h   |  2 +-
 kernel/auditsc.c | 22 ++++++++--------------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/kernel/audit.h b/kernel/audit.h
index 316fac62d5f7..4af63e7dde17 100644
--- a/kernel/audit.h
+++ b/kernel/audit.h
@@ -82,7 +82,7 @@  struct audit_names {
 	kuid_t			uid;
 	kgid_t			gid;
 	dev_t			rdev;
-	u32			osid;
+	struct lsmblob		lsmblob;
 	struct audit_cap_data	fcap;
 	unsigned int		fcap_ver;
 	unsigned char		type;		/* record type */
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 318529b1f930..4f141655ac0b 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -700,17 +700,16 @@  static int audit_filter_rules(struct task_struct *tsk,
 					 * lsmblob, which happens later in
 					 * this patch set.
 					 */
-					lsmblob_init(&blob, name->osid);
 					result = security_audit_rule_match(
-								&blob,
+								&name->lsmblob,
 								f->type,
 								f->op,
 								&f->lsm_rules);
 				} else if (ctx) {
 					list_for_each_entry(n, &ctx->names_list, list) {
-						lsmblob_init(&blob, n->osid);
 						if (security_audit_rule_match(
-							&blob, f->type, f->op,
+							&n->lsmblob,
+							f->type, f->op,
 							&f->lsm_rules)) {
 							++result;
 							break;
@@ -1589,13 +1588,12 @@  static void audit_log_name(struct audit_context *context, struct audit_names *n,
 				 from_kgid(&init_user_ns, n->gid),
 				 MAJOR(n->rdev),
 				 MINOR(n->rdev));
-	if (n->osid != 0) {
-		struct lsmblob blob;
+	if (lsmblob_is_set(&n->lsmblob)) {
 		struct lsmcontext lsmctx;
 
-		lsmblob_init(&blob, n->osid);
-		if (security_secid_to_secctx(&blob, &lsmctx, LSMBLOB_FIRST)) {
-			audit_log_format(ab, " osid=%u", n->osid);
+		if (security_secid_to_secctx(&n->lsmblob, &lsmctx,
+					     LSMBLOB_FIRST)) {
+			audit_log_format(ab, " osid=?");
 			if (call_panic)
 				*call_panic = 2;
 		} else {
@@ -2303,17 +2301,13 @@  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, &blob);
-	/* scaffolding until osid is updated */
-	name->osid = lsmblob_first(&blob);
+	security_inode_getsecid(inode, &name->lsmblob);
 	if (flags & AUDIT_INODE_NOEVAL) {
 		name->fcap_ver = -1;
 		return;

[v37,23/33] Audit: Keep multiple LSM data in audit_names

Commit Message

Patch