[v38,29/39] Audit: Keep multiple LSM data in audit_names

Message ID	20220927195421.14713-30-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 29/39] Audit: Keep multiple LSM data in audit_names Date: Tue, 27 Sep 2022 12:54:11 -0700 Message-Id: <20220927195421.14713-30-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-30-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 29/39] Audit: Keep multiple LSM data in audit_names
Date: Tue, 27 Sep 2022 12:54:11 -0700
Message-Id: <20220927195421.14713-30-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:54 p.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 ca00187b4864..e8f632736d2b 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;
@@ -1564,13 +1563,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 {
@@ -2278,17 +2276,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;

[v38,29/39] Audit: Keep multiple LSM data in audit_names

Commit Message

Patch