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, sds@tycho.nsa.gov, linux-kernel@vger.kernel.org Subject: [PATCH v31 25/28] Audit: Add record for multiple task security contexts Date: Mon, 13 Dec 2021 15:40:31 -0800 [thread overview] Message-ID: <20211213234034.111891-26-casey@schaufler-ca.com> (raw) In-Reply-To: <20211213234034.111891-1-casey@schaufler-ca.com> Create a new audit record AUDIT_MAC_TASK_CONTEXTS. An example of the MAC_TASK_CONTEXTS (1420) record is: type=MAC_TASK_CONTEXTS[1420] msg=audit(1600880931.832:113) subj_apparmor=unconfined subj_smack=_ When an audit event includes a AUDIT_MAC_TASK_CONTEXTS record the "subj=" field in other records in the event will be "subj=?". An AUDIT_MAC_TASK_CONTEXTS record is supplied when the system has multiple security modules that may make access decisions based on a subject security context. Signed-off-by: Casey Schaufler <casey@schaufler-ca.com> --- include/linux/security.h | 9 ++++++ include/uapi/linux/audit.h | 1 + kernel/audit.c | 58 ++++++++++++++++++++++++++++++++------ 3 files changed, 60 insertions(+), 8 deletions(-) diff --git a/include/linux/security.h b/include/linux/security.h index bec8505f2ce5..a54179451410 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -231,6 +231,15 @@ static inline bool lsmblob_equal(struct lsmblob *bloba, struct lsmblob *blobb) extern int lsm_name_to_slot(char *name); extern const char *lsm_slot_to_name(int slot); +static inline bool lsm_multiple_contexts(void) +{ +#ifdef CONFIG_SECURITY + return lsm_slot_to_name(1) != NULL; +#else + return false; +#endif +} + /** * lsmblob_value - find the first non-zero value in an lsmblob structure. * @blob: Pointer to the data diff --git a/include/uapi/linux/audit.h b/include/uapi/linux/audit.h index 9176a095fefc..86ad3da4f0d4 100644 --- a/include/uapi/linux/audit.h +++ b/include/uapi/linux/audit.h @@ -143,6 +143,7 @@ #define AUDIT_MAC_UNLBL_STCDEL 1417 /* NetLabel: del a static label */ #define AUDIT_MAC_CALIPSO_ADD 1418 /* NetLabel: add CALIPSO DOI entry */ #define AUDIT_MAC_CALIPSO_DEL 1419 /* NetLabel: del CALIPSO DOI entry */ +#define AUDIT_MAC_TASK_CONTEXTS 1420 /* Multiple LSM task contexts */ #define AUDIT_FIRST_KERN_ANOM_MSG 1700 #define AUDIT_LAST_KERN_ANOM_MSG 1799 diff --git a/kernel/audit.c b/kernel/audit.c index fc3662ff126e..4ee2bf620df7 100644 --- a/kernel/audit.c +++ b/kernel/audit.c @@ -197,6 +197,9 @@ static struct audit_ctl_mutex { struct audit_context_entry { struct list_head list; int type; /* Audit record type */ + union { + struct lsmblob lsm_subjs; + }; }; /* The audit_buffer is used when formatting an audit record. The caller @@ -2149,15 +2152,30 @@ int audit_log_task_context(struct audit_buffer *ab) if (!lsmblob_is_set(&blob)) return 0; - error = security_secid_to_secctx(&blob, &context, LSMBLOB_FIRST); - if (error) { - if (error != -EINVAL) + if (!lsm_multiple_contexts()) { + error = security_secid_to_secctx(&blob, &context, + LSMBLOB_FIRST); + if (error) { + if (error != -EINVAL) + goto error_path; + return 0; + } + audit_log_format(ab, " subj=%s", context.context); + security_release_secctx(&context); + } else { + struct audit_context_entry *ace; + + audit_log_format(ab, " subj=?"); + ace = kzalloc(sizeof(*ace), ab->gfp_mask); + if (!ace) { + error = -ENOMEM; goto error_path; - return 0; + } + INIT_LIST_HEAD(&ace->list); + ace->type = AUDIT_MAC_TASK_CONTEXTS; + ace->lsm_subjs = blob; + list_add(&ace->list, &ab->aux_records); } - - audit_log_format(ab, " subj=%s", context.context); - security_release_secctx(&context); return 0; error_path: @@ -2419,9 +2437,12 @@ void audit_log_end(struct audit_buffer *ab) struct audit_context_entry *entry; struct audit_context mcontext; struct audit_context *mctx; + struct lsmcontext lcontext; struct audit_buffer *mab; struct list_head *l; struct list_head *n; + int rc; + int i; if (!ab) return; @@ -2434,6 +2455,7 @@ void audit_log_end(struct audit_buffer *ab) } if (ab->ctx == NULL) { + mcontext.context = AUDIT_CTX_SYSCALL; mcontext.stamp = ab->stamp; mctx = &mcontext; } else @@ -2447,7 +2469,27 @@ void audit_log_end(struct audit_buffer *ab) continue; } switch (entry->type) { - /* Don't know of any quite yet. */ + case AUDIT_MAC_TASK_CONTEXTS: + for (i = 0; i < LSMBLOB_ENTRIES; i++) { + if (entry->lsm_subjs.secid[i] == 0) + continue; + rc = security_secid_to_secctx(&entry->lsm_subjs, + &lcontext, i); + if (rc) { + if (rc != -EINVAL) + audit_panic("error in audit_log_end"); + audit_log_format(mab, "%ssubj_%s=?", + i ? " " : "", + lsm_slot_to_name(i)); + } else { + audit_log_format(mab, "%ssubj_%s=%s", + i ? " " : "", + lsm_slot_to_name(i), + lcontext.context); + security_release_secctx(&lcontext); + } + } + break; default: audit_panic("Unknown type in audit_log_end"); break; -- 2.31.1
WARNING: multiple messages have this Message-ID (diff)
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: john.johansen@canonical.com, linux-kernel@vger.kernel.org, linux-audit@redhat.com, sds@tycho.nsa.gov Subject: [PATCH v31 25/28] Audit: Add record for multiple task security contexts Date: Mon, 13 Dec 2021 15:40:31 -0800 [thread overview] Message-ID: <20211213234034.111891-26-casey@schaufler-ca.com> (raw) In-Reply-To: <20211213234034.111891-1-casey@schaufler-ca.com> Create a new audit record AUDIT_MAC_TASK_CONTEXTS. An example of the MAC_TASK_CONTEXTS (1420) record is: type=MAC_TASK_CONTEXTS[1420] msg=audit(1600880931.832:113) subj_apparmor=unconfined subj_smack=_ When an audit event includes a AUDIT_MAC_TASK_CONTEXTS record the "subj=" field in other records in the event will be "subj=?". An AUDIT_MAC_TASK_CONTEXTS record is supplied when the system has multiple security modules that may make access decisions based on a subject security context. Signed-off-by: Casey Schaufler <casey@schaufler-ca.com> --- include/linux/security.h | 9 ++++++ include/uapi/linux/audit.h | 1 + kernel/audit.c | 58 ++++++++++++++++++++++++++++++++------ 3 files changed, 60 insertions(+), 8 deletions(-) diff --git a/include/linux/security.h b/include/linux/security.h index bec8505f2ce5..a54179451410 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -231,6 +231,15 @@ static inline bool lsmblob_equal(struct lsmblob *bloba, struct lsmblob *blobb) extern int lsm_name_to_slot(char *name); extern const char *lsm_slot_to_name(int slot); +static inline bool lsm_multiple_contexts(void) +{ +#ifdef CONFIG_SECURITY + return lsm_slot_to_name(1) != NULL; +#else + return false; +#endif +} + /** * lsmblob_value - find the first non-zero value in an lsmblob structure. * @blob: Pointer to the data diff --git a/include/uapi/linux/audit.h b/include/uapi/linux/audit.h index 9176a095fefc..86ad3da4f0d4 100644 --- a/include/uapi/linux/audit.h +++ b/include/uapi/linux/audit.h @@ -143,6 +143,7 @@ #define AUDIT_MAC_UNLBL_STCDEL 1417 /* NetLabel: del a static label */ #define AUDIT_MAC_CALIPSO_ADD 1418 /* NetLabel: add CALIPSO DOI entry */ #define AUDIT_MAC_CALIPSO_DEL 1419 /* NetLabel: del CALIPSO DOI entry */ +#define AUDIT_MAC_TASK_CONTEXTS 1420 /* Multiple LSM task contexts */ #define AUDIT_FIRST_KERN_ANOM_MSG 1700 #define AUDIT_LAST_KERN_ANOM_MSG 1799 diff --git a/kernel/audit.c b/kernel/audit.c index fc3662ff126e..4ee2bf620df7 100644 --- a/kernel/audit.c +++ b/kernel/audit.c @@ -197,6 +197,9 @@ static struct audit_ctl_mutex { struct audit_context_entry { struct list_head list; int type; /* Audit record type */ + union { + struct lsmblob lsm_subjs; + }; }; /* The audit_buffer is used when formatting an audit record. The caller @@ -2149,15 +2152,30 @@ int audit_log_task_context(struct audit_buffer *ab) if (!lsmblob_is_set(&blob)) return 0; - error = security_secid_to_secctx(&blob, &context, LSMBLOB_FIRST); - if (error) { - if (error != -EINVAL) + if (!lsm_multiple_contexts()) { + error = security_secid_to_secctx(&blob, &context, + LSMBLOB_FIRST); + if (error) { + if (error != -EINVAL) + goto error_path; + return 0; + } + audit_log_format(ab, " subj=%s", context.context); + security_release_secctx(&context); + } else { + struct audit_context_entry *ace; + + audit_log_format(ab, " subj=?"); + ace = kzalloc(sizeof(*ace), ab->gfp_mask); + if (!ace) { + error = -ENOMEM; goto error_path; - return 0; + } + INIT_LIST_HEAD(&ace->list); + ace->type = AUDIT_MAC_TASK_CONTEXTS; + ace->lsm_subjs = blob; + list_add(&ace->list, &ab->aux_records); } - - audit_log_format(ab, " subj=%s", context.context); - security_release_secctx(&context); return 0; error_path: @@ -2419,9 +2437,12 @@ void audit_log_end(struct audit_buffer *ab) struct audit_context_entry *entry; struct audit_context mcontext; struct audit_context *mctx; + struct lsmcontext lcontext; struct audit_buffer *mab; struct list_head *l; struct list_head *n; + int rc; + int i; if (!ab) return; @@ -2434,6 +2455,7 @@ void audit_log_end(struct audit_buffer *ab) } if (ab->ctx == NULL) { + mcontext.context = AUDIT_CTX_SYSCALL; mcontext.stamp = ab->stamp; mctx = &mcontext; } else @@ -2447,7 +2469,27 @@ void audit_log_end(struct audit_buffer *ab) continue; } switch (entry->type) { - /* Don't know of any quite yet. */ + case AUDIT_MAC_TASK_CONTEXTS: + for (i = 0; i < LSMBLOB_ENTRIES; i++) { + if (entry->lsm_subjs.secid[i] == 0) + continue; + rc = security_secid_to_secctx(&entry->lsm_subjs, + &lcontext, i); + if (rc) { + if (rc != -EINVAL) + audit_panic("error in audit_log_end"); + audit_log_format(mab, "%ssubj_%s=?", + i ? " " : "", + lsm_slot_to_name(i)); + } else { + audit_log_format(mab, "%ssubj_%s=%s", + i ? " " : "", + lsm_slot_to_name(i), + lcontext.context); + security_release_secctx(&lcontext); + } + } + break; default: audit_panic("Unknown type in audit_log_end"); break; -- 2.31.1 -- Linux-audit mailing list Linux-audit@redhat.com https://listman.redhat.com/mailman/listinfo/linux-audit
next prev parent reply other threads:[~2021-12-14 0:08 UTC|newest] Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <20211213234034.111891-1-casey.ref@schaufler-ca.com> 2021-12-13 23:40 ` [PATCH v31 00/28] LSM: Module stacking for AppArmor Casey Schaufler 2021-12-13 23:40 ` Casey Schaufler 2021-12-13 23:40 ` [PATCH v31 01/28] integrity: disassociate ima_filter_rule from security_audit_rule Casey Schaufler 2021-12-13 23:40 ` Casey Schaufler 2021-12-14 13:33 ` kernel test robot 2021-12-14 13:33 ` kernel test robot 2021-12-14 13:33 ` kernel test robot 2021-12-13 23:40 ` [PATCH v31 02/28] LSM: Infrastructure management of the sock security Casey Schaufler 2021-12-13 23:40 ` Casey Schaufler 2021-12-13 23:40 ` [PATCH v31 03/28] LSM: Add the lsmblob data structure Casey Schaufler 2021-12-13 23:40 ` Casey Schaufler 2021-12-13 23:40 ` [PATCH v31 04/28] LSM: provide lsm name and id slot mappings Casey Schaufler 2021-12-13 23:40 ` Casey Schaufler 2021-12-13 23:40 ` [PATCH v31 05/28] IMA: avoid label collisions with stacked LSMs Casey Schaufler 2021-12-13 23:40 ` Casey Schaufler 2021-12-13 23:40 ` [PATCH v31 06/28] LSM: Use lsmblob in security_audit_rule_match Casey Schaufler 2021-12-13 23:40 ` Casey Schaufler 2021-12-13 23:40 ` [PATCH v31 07/28] LSM: Use lsmblob in security_kernel_act_as Casey Schaufler 2021-12-13 23:40 ` Casey Schaufler 2021-12-13 23:40 ` [PATCH v31 08/28] LSM: Use lsmblob in security_secctx_to_secid Casey Schaufler 2021-12-13 23:40 ` Casey Schaufler 2021-12-13 23:40 ` [PATCH v31 09/28] LSM: Use lsmblob in security_secid_to_secctx Casey Schaufler 2021-12-13 23:40 ` Casey Schaufler 2021-12-13 23:40 ` [PATCH v31 10/28] LSM: Use lsmblob in security_ipc_getsecid Casey Schaufler 2021-12-13 23:40 ` Casey Schaufler 2021-12-13 23:40 ` [PATCH v31 11/28] LSM: Use lsmblob in security_task_getsecid Casey Schaufler 2021-12-13 23:40 ` Casey Schaufler 2021-12-13 23:40 ` [PATCH v31 12/28] LSM: Use lsmblob in security_inode_getsecid Casey Schaufler 2021-12-13 23:40 ` Casey Schaufler 2021-12-13 23:40 ` [PATCH v31 13/28] LSM: Use lsmblob in security_cred_getsecid Casey Schaufler 2021-12-13 23:40 ` Casey Schaufler 2021-12-15 9:14 ` kernel test robot 2021-12-15 9:14 ` kernel test robot 2021-12-15 9:14 ` kernel test robot 2021-12-13 23:40 ` [PATCH v31 14/28] LSM: Specify which LSM to display Casey Schaufler 2021-12-13 23:40 ` Casey Schaufler 2021-12-14 18:38 ` Christian Göttsche 2021-12-14 18:38 ` Christian Göttsche 2021-12-14 18:49 ` Casey Schaufler 2021-12-14 18:49 ` Casey Schaufler 2021-12-13 23:40 ` [PATCH v31 15/28] LSM: Ensure the correct LSM context releaser Casey Schaufler 2021-12-13 23:40 ` Casey Schaufler 2021-12-13 23:40 ` [PATCH v31 16/28] LSM: Use lsmcontext in security_secid_to_secctx Casey Schaufler 2021-12-13 23:40 ` Casey Schaufler 2021-12-13 23:40 ` [PATCH v31 17/28] LSM: Use lsmcontext in security_inode_getsecctx Casey Schaufler 2021-12-13 23:40 ` Casey Schaufler 2021-12-13 23:40 ` [PATCH v31 18/28] LSM: security_secid_to_secctx in netlink netfilter Casey Schaufler 2021-12-13 23:40 ` Casey Schaufler 2021-12-13 23:40 ` [PATCH v31 19/28] NET: Store LSM netlabel data in a lsmblob Casey Schaufler 2021-12-13 23:40 ` Casey Schaufler 2021-12-13 23:40 ` [PATCH v31 20/28] binder: Pass LSM identifier for confirmation Casey Schaufler 2021-12-13 23:40 ` Casey Schaufler 2021-12-13 23:40 ` [PATCH v31 21/28] LSM: Extend security_secid_to_secctx to include module selection Casey Schaufler 2021-12-13 23:40 ` Casey Schaufler 2021-12-13 23:40 ` [PATCH v31 22/28] Audit: Keep multiple LSM data in audit_names Casey Schaufler 2021-12-13 23:40 ` Casey Schaufler 2021-12-13 23:40 ` [PATCH v31 23/28] Audit: Create audit_stamp structure Casey Schaufler 2021-12-13 23:40 ` Casey Schaufler 2021-12-13 23:40 ` [PATCH v31 24/28] Audit: Add framework for auxiliary records Casey Schaufler 2021-12-13 23:40 ` Casey Schaufler 2021-12-13 23:40 ` Casey Schaufler [this message] 2021-12-13 23:40 ` [PATCH v31 25/28] Audit: Add record for multiple task security contexts Casey Schaufler 2021-12-13 23:40 ` [PATCH v31 26/28] Audit: Add record for multiple object " Casey Schaufler 2021-12-13 23:40 ` Casey Schaufler 2021-12-14 13:12 ` kernel test robot 2021-12-14 13:12 ` kernel test robot 2021-12-14 13:12 ` kernel test robot 2021-12-14 13:22 ` kernel test robot 2021-12-14 13:22 ` kernel test robot 2021-12-14 13:22 ` kernel test robot 2021-12-13 23:40 ` [PATCH v31 27/28] LSM: Add /proc attr entry for full LSM context Casey Schaufler 2021-12-13 23:40 ` Casey Schaufler 2021-12-13 23:40 ` [PATCH v31 28/28] AppArmor: Remove the exclusive flag Casey Schaufler 2021-12-13 23:40 ` 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=20211213234034.111891-26-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=sds@tycho.nsa.gov \ --cc=selinux@vger.kernel.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.