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 v36 30/33] netlabel: Use a struct lsmblob in audit data
Date: Thu, 9 Jun 2022 16:01:43 -0700 [thread overview]
Message-ID: <20220609230146.319210-31-casey@schaufler-ca.com> (raw)
In-Reply-To: <20220609230146.319210-1-casey@schaufler-ca.com>
Remove scaffolding in netlabel audit by keeping subject
lsm information in an lsmblob structure instead of a secid.
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 8deee7e176a9..9277c6dd79f5 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;
}
/*
--
2.35.1
next prev parent reply other threads:[~2022-06-09 23:18 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20220609230146.319210-1-casey.ref@schaufler-ca.com>
2022-06-09 23:01 ` [PATCH v36 00/33] LSM: Module stacking for AppArmor Casey Schaufler
2022-06-09 23:01 ` [PATCH v36 01/33] integrity: disassociate ima_filter_rule from security_audit_rule Casey Schaufler
2022-06-09 23:01 ` [PATCH v36 02/33] LSM: Infrastructure management of the sock security Casey Schaufler
2022-06-09 23:01 ` [PATCH v36 03/33] LSM: Add the lsmblob data structure Casey Schaufler
2022-06-09 23:01 ` [PATCH v36 04/33] LSM: provide lsm name and id slot mappings Casey Schaufler
2022-06-10 7:51 ` kernel test robot
2022-06-09 23:01 ` [PATCH v36 05/33] IMA: avoid label collisions with stacked LSMs Casey Schaufler
2022-06-09 23:01 ` [PATCH v36 06/33] LSM: Use lsmblob in security_audit_rule_match Casey Schaufler
2022-06-09 23:01 ` [PATCH v36 07/33] LSM: Use lsmblob in security_kernel_act_as Casey Schaufler
2022-06-09 23:01 ` [PATCH v36 08/33] LSM: Use lsmblob in security_secctx_to_secid Casey Schaufler
2022-06-09 23:01 ` [PATCH v36 09/33] LSM: Use lsmblob in security_secid_to_secctx Casey Schaufler
2022-06-09 23:01 ` [PATCH v36 10/33] LSM: Use lsmblob in security_ipc_getsecid Casey Schaufler
2022-06-09 23:01 ` [PATCH v36 11/33] LSM: Use lsmblob in security_current_getsecid Casey Schaufler
2022-06-09 23:01 ` [PATCH v36 12/33] LSM: Use lsmblob in security_inode_getsecid Casey Schaufler
2022-06-09 23:01 ` [PATCH v36 13/33] LSM: Use lsmblob in security_cred_getsecid Casey Schaufler
2022-06-12 19:35 ` kernel test robot
2022-06-09 23:01 ` [PATCH v36 14/33] LSM: Specify which LSM to display Casey Schaufler
2022-06-09 23:01 ` [PATCH v36 15/33] LSM: Ensure the correct LSM context releaser Casey Schaufler
2022-06-09 23:01 ` [PATCH v36 16/33] LSM: Use lsmcontext in security_secid_to_secctx Casey Schaufler
2022-06-09 23:01 ` [PATCH v36 17/33] LSM: Use lsmcontext in security_inode_getsecctx Casey Schaufler
2022-06-09 23:01 ` [PATCH v36 18/33] LSM: Use lsmcontext in security_dentry_init_security Casey Schaufler
2022-06-10 3:05 ` kernel test robot
2022-06-23 7:09 ` Dan Carpenter
2022-06-09 23:01 ` [PATCH v36 19/33] LSM: security_secid_to_secctx in netlink netfilter Casey Schaufler
2022-06-09 23:01 ` [PATCH v36 20/33] NET: Store LSM netlabel data in a lsmblob Casey Schaufler
2022-06-09 23:01 ` [PATCH v36 21/33] binder: Pass LSM identifier for confirmation Casey Schaufler
2022-06-09 23:01 ` [PATCH v36 22/33] LSM: Extend security_secid_to_secctx to include module selection Casey Schaufler
2022-06-09 23:01 ` [PATCH v36 23/33] Audit: Keep multiple LSM data in audit_names Casey Schaufler
2022-06-09 23:01 ` [PATCH v36 24/33] Audit: Create audit_stamp structure Casey Schaufler
2022-06-09 23:01 ` [PATCH v36 25/33] LSM: Add a function to report multiple LSMs Casey Schaufler
2022-06-09 23:01 ` [PATCH v36 26/33] Audit: Allow multiple records in an audit_buffer Casey Schaufler
2022-06-10 21:04 ` Paul Moore
2022-06-09 23:01 ` [PATCH v36 27/33] Audit: Add record for multiple task security contexts Casey Schaufler
2022-06-10 21:06 ` Paul Moore
2022-06-09 23:01 ` [PATCH v36 28/33] audit: multiple subject lsm values for netlabel Casey Schaufler
2022-06-10 21:10 ` Paul Moore
2022-06-09 23:01 ` [PATCH v36 29/33] Audit: Add record for multiple object contexts Casey Schaufler
2022-06-09 23:01 ` Casey Schaufler [this message]
2022-06-10 21:12 ` [PATCH v36 30/33] netlabel: Use a struct lsmblob in audit data Paul Moore
2022-06-09 23:01 ` [PATCH v36 31/33] LSM: Removed scaffolding function lsmcontext_init Casey Schaufler
2022-06-09 23:01 ` [PATCH v36 32/33] LSM: Add /proc attr entry for full LSM context Casey Schaufler
2022-06-09 23:01 ` [PATCH v36 33/33] AppArmor: Remove the exclusive flag Casey Schaufler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220609230146.319210-31-casey@schaufler-ca.com \
--to=casey@schaufler-ca.com \
--cc=casey.schaufler@intel.com \
--cc=jmorris@namei.org \
--cc=john.johansen@canonical.com \
--cc=keescook@chromium.org \
--cc=linux-audit@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=paul@paul-moore.com \
--cc=penguin-kernel@i-love.sakura.ne.jp \
--cc=selinux@vger.kernel.org \
--cc=stephen.smalley.work@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).