[v38,36/39] netlabel: Use a struct lsmblob in audit data

Message ID	20220927195421.14713-37-casey@schaufler-ca.com (mailing list archive)
State	Changes Requested
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, 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 36/39] netlabel: Use a struct lsmblob in audit data Date: Tue, 27 Sep 2022 12:54:18 -0700 Message-Id: <20220927195421.14713-37-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	LSM: Module stacking for AppArmor \| expand [v38,00/39] LSM: Module stacking for AppArmor [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-37-casey@schaufler-ca.com (mailing list archive)

State

Changes Requested

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 36/39] netlabel: Use a struct lsmblob in audit data
Date: Tue, 27 Sep 2022 12:54:18 -0700
Message-Id: <20220927195421.14713-37-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

LSM: Module stacking for AppArmor | expand

Commit Message

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

Remove scaffolding in netlabel audit by keeping subject
lsm information in an lsmblob structure instead of a secid.

Acked-by: Paul Moore <paul@paul-moore.com>
Signed-off-by: Casey Schaufler <casey@schaufler-ca.com>
---
 include/net/netlabel.h            | 2 +-
 net/netlabel/netlabel_unlabeled.c | 4 +---
 net/netlabel/netlabel_user.c      | 4 +---
 net/netlabel/netlabel_user.h      | 6 +-----
 security/smack/smackfs.c          | 2 +-
 5 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/include/net/netlabel.h b/include/net/netlabel.h
index 73fc25b4042b..d9aaa264e29c 100644
--- a/include/net/netlabel.h
+++ b/include/net/netlabel.h
@@ -97,7 +97,7 @@  struct calipso_doi;
 
 /* NetLabel audit information */
 struct netlbl_audit {
-	u32 secid;
+	struct lsmblob lsmblob;
 	kuid_t loginuid;
 	unsigned int sessionid;
 };
diff --git a/net/netlabel/netlabel_unlabeled.c b/net/netlabel/netlabel_unlabeled.c
index 050753d2f2bb..24519b803a6c 100644
--- a/net/netlabel/netlabel_unlabeled.c
+++ b/net/netlabel/netlabel_unlabeled.c
@@ -1529,13 +1529,11 @@  int __init netlbl_unlabel_defconf(void)
 	int ret_val;
 	struct netlbl_dom_map *entry;
 	struct netlbl_audit audit_info;
-	struct lsmblob blob;
 
 	/* Only the kernel is allowed to call this function and the only time
 	 * it is called is at bootup before the audit subsystem is reporting
 	 * messages so don't worry to much about these values. */
-	security_current_getsecid_subj(&blob);
-	audit_info.secid = lsmblob_first(&blob);
+	security_current_getsecid_subj(&audit_info.lsmblob);
 	audit_info.loginuid = GLOBAL_ROOT_UID;
 	audit_info.sessionid = 0;
 
diff --git a/net/netlabel/netlabel_user.c b/net/netlabel/netlabel_user.c
index 42812bdfc31a..e72dfe2da77a 100644
--- a/net/netlabel/netlabel_user.c
+++ b/net/netlabel/netlabel_user.c
@@ -84,7 +84,6 @@  struct audit_buffer *netlbl_audit_start_common(int type,
 					       struct netlbl_audit *audit_info)
 {
 	struct audit_buffer *audit_buf;
-	struct lsmblob blob;
 
 	if (audit_enabled == AUDIT_OFF)
 		return NULL;
@@ -97,8 +96,7 @@  struct audit_buffer *netlbl_audit_start_common(int type,
 			 from_kuid(&init_user_ns, audit_info->loginuid),
 			 audit_info->sessionid);
 
-	lsmblob_init(&blob, audit_info->secid);
-	audit_log_subject_context(audit_buf, &blob);
+	audit_log_subject_context(audit_buf, &audit_info->lsmblob);
 
 	return audit_buf;
 }
diff --git a/net/netlabel/netlabel_user.h b/net/netlabel/netlabel_user.h
index 34bb6572f33b..56a634244a6e 100644
--- a/net/netlabel/netlabel_user.h
+++ b/net/netlabel/netlabel_user.h
@@ -32,11 +32,7 @@ 
  */
 static inline void netlbl_netlink_auditinfo(struct netlbl_audit *audit_info)
 {
-	struct lsmblob blob;
-
-	security_current_getsecid_subj(&blob);
-	/* scaffolding until secid is converted */
-	audit_info->secid = lsmblob_first(&blob);
+	security_current_getsecid_subj(&audit_info->lsmblob);
 	audit_info->loginuid = audit_get_loginuid(current);
 	audit_info->sessionid = audit_get_sessionid(current);
 }
diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c
index 314336463111..f74207f6c71e 100644
--- a/security/smack/smackfs.c
+++ b/security/smack/smackfs.c
@@ -186,7 +186,7 @@  static void smk_netlabel_audit_set(struct netlbl_audit *nap)
 
 	nap->loginuid = audit_get_loginuid(current);
 	nap->sessionid = audit_get_sessionid(current);
-	nap->secid = skp->smk_secid;
+	nap->lsmblob.secid[smack_lsmid.slot] = skp->smk_secid;
 }
 
 /*

[v38,36/39] netlabel: Use a struct lsmblob in audit data

Commit Message

Patch