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, Richard Guy Briggs <rgb@redhat.com> Subject: [PATCH v26 21/25] audit: add support for non-syscall auxiliary records Date: Thu, 13 May 2021 13:08:03 -0700 [thread overview] Message-ID: <20210513200807.15910-22-casey@schaufler-ca.com> (raw) In-Reply-To: <20210513200807.15910-1-casey@schaufler-ca.com> Standalone audit records have the timestamp and serial number generated on the fly and as such are unique, making them standalone. This new function audit_alloc_local() generates a local audit context that will be used only for a standalone record and its auxiliary record(s). The context is discarded immediately after the local associated records are produced. Signed-off-by: Richard Guy Briggs <rgb@redhat.com> Signed-off-by: Casey Schaufler <casey@schaufler-ca.com> Cc: linux-audit@redhat.com To: Richard Guy Briggs <rgb@redhat.com> --- include/linux/audit.h | 8 ++++++++ kernel/audit.h | 1 + kernel/auditsc.c | 33 ++++++++++++++++++++++++++++----- 3 files changed, 37 insertions(+), 5 deletions(-) diff --git a/include/linux/audit.h b/include/linux/audit.h index 418a485af114..97cd7471e572 100644 --- a/include/linux/audit.h +++ b/include/linux/audit.h @@ -289,6 +289,8 @@ static inline int audit_signal_info(int sig, struct task_struct *t) /* Public API */ extern int audit_alloc(struct task_struct *task); extern void __audit_free(struct task_struct *task); +extern struct audit_context *audit_alloc_local(gfp_t gfpflags); +extern void audit_free_context(struct audit_context *context); extern void __audit_syscall_entry(int major, unsigned long a0, unsigned long a1, unsigned long a2, unsigned long a3); extern void __audit_syscall_exit(int ret_success, long ret_value); @@ -552,6 +554,12 @@ static inline void audit_log_nfcfg(const char *name, u8 af, extern int audit_n_rules; extern int audit_signals; #else /* CONFIG_AUDITSYSCALL */ ++static inline struct audit_context *audit_alloc_local(gfp_t gfpflags) +{ + return NULL; +} +static inline void audit_free_context(struct audit_context *context) +{ } static inline int audit_alloc(struct task_struct *task) { return 0; diff --git a/kernel/audit.h b/kernel/audit.h index 23a85a470121..27ef690afd30 100644 --- a/kernel/audit.h +++ b/kernel/audit.h @@ -99,6 +99,7 @@ struct audit_proctitle { struct audit_context { int dummy; /* must be the first element */ int in_syscall; /* 1 if task is in a syscall */ + bool local; /* local context needed */ enum audit_state state, current_state; unsigned int serial; /* serial number for record */ int major; /* syscall number */ diff --git a/kernel/auditsc.c b/kernel/auditsc.c index 67da23f6bebd..d4e061f95da8 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c @@ -925,11 +925,13 @@ static inline void audit_free_aux(struct audit_context *context) } } -static inline struct audit_context *audit_alloc_context(enum audit_state state) +static inline struct audit_context *audit_alloc_context(enum audit_state state, + gfp_t gfpflags) { struct audit_context *context; - context = kzalloc(sizeof(*context), GFP_KERNEL); + /* We can be called in atomic context via audit_tg() */ + context = kzalloc(sizeof(*context), gfpflags); if (!context) return NULL; context->state = state; @@ -965,7 +967,8 @@ int audit_alloc(struct task_struct *tsk) return 0; } - if (!(context = audit_alloc_context(state))) { + context = audit_alloc_context(state, GFP_KERNEL); + if (!context) { kfree(key); audit_log_lost("out of memory in audit_alloc"); return -ENOMEM; @@ -977,8 +980,27 @@ int audit_alloc(struct task_struct *tsk) return 0; } -static inline void audit_free_context(struct audit_context *context) +struct audit_context *audit_alloc_local(gfp_t gfpflags) { + struct audit_context *context = NULL; + + context = audit_alloc_context(AUDIT_RECORD_CONTEXT, gfpflags); + if (!context) { + audit_log_lost("out of memory in audit_alloc_local"); + goto out; + } + context->serial = audit_serial(); + ktime_get_coarse_real_ts64(&context->ctime); + context->local = true; +out: + return context; +} +EXPORT_SYMBOL(audit_alloc_local); + +void audit_free_context(struct audit_context *context) +{ + if (!context) + return; audit_free_module(context); audit_free_names(context); unroll_tree_refs(context, NULL, 0); @@ -989,6 +1011,7 @@ static inline void audit_free_context(struct audit_context *context) audit_proctitle_free(context); kfree(context); } +EXPORT_SYMBOL(audit_free_context); static int audit_log_pid_context(struct audit_context *context, pid_t pid, kuid_t auid, kuid_t uid, @@ -2210,7 +2233,7 @@ EXPORT_SYMBOL_GPL(__audit_inode_child); int auditsc_get_stamp(struct audit_context *ctx, struct timespec64 *t, unsigned int *serial) { - if (!ctx->in_syscall) + if (!ctx->in_syscall && !ctx->local) return 0; if (!ctx->serial) ctx->serial = audit_serial(); -- 2.29.2
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, Richard Guy Briggs <rgb@redhat.com>, linux-audit@redhat.com, sds@tycho.nsa.gov Subject: [PATCH v26 21/25] audit: add support for non-syscall auxiliary records Date: Thu, 13 May 2021 13:08:03 -0700 [thread overview] Message-ID: <20210513200807.15910-22-casey@schaufler-ca.com> (raw) In-Reply-To: <20210513200807.15910-1-casey@schaufler-ca.com> Standalone audit records have the timestamp and serial number generated on the fly and as such are unique, making them standalone. This new function audit_alloc_local() generates a local audit context that will be used only for a standalone record and its auxiliary record(s). The context is discarded immediately after the local associated records are produced. Signed-off-by: Richard Guy Briggs <rgb@redhat.com> Signed-off-by: Casey Schaufler <casey@schaufler-ca.com> Cc: linux-audit@redhat.com To: Richard Guy Briggs <rgb@redhat.com> --- include/linux/audit.h | 8 ++++++++ kernel/audit.h | 1 + kernel/auditsc.c | 33 ++++++++++++++++++++++++++++----- 3 files changed, 37 insertions(+), 5 deletions(-) diff --git a/include/linux/audit.h b/include/linux/audit.h index 418a485af114..97cd7471e572 100644 --- a/include/linux/audit.h +++ b/include/linux/audit.h @@ -289,6 +289,8 @@ static inline int audit_signal_info(int sig, struct task_struct *t) /* Public API */ extern int audit_alloc(struct task_struct *task); extern void __audit_free(struct task_struct *task); +extern struct audit_context *audit_alloc_local(gfp_t gfpflags); +extern void audit_free_context(struct audit_context *context); extern void __audit_syscall_entry(int major, unsigned long a0, unsigned long a1, unsigned long a2, unsigned long a3); extern void __audit_syscall_exit(int ret_success, long ret_value); @@ -552,6 +554,12 @@ static inline void audit_log_nfcfg(const char *name, u8 af, extern int audit_n_rules; extern int audit_signals; #else /* CONFIG_AUDITSYSCALL */ ++static inline struct audit_context *audit_alloc_local(gfp_t gfpflags) +{ + return NULL; +} +static inline void audit_free_context(struct audit_context *context) +{ } static inline int audit_alloc(struct task_struct *task) { return 0; diff --git a/kernel/audit.h b/kernel/audit.h index 23a85a470121..27ef690afd30 100644 --- a/kernel/audit.h +++ b/kernel/audit.h @@ -99,6 +99,7 @@ struct audit_proctitle { struct audit_context { int dummy; /* must be the first element */ int in_syscall; /* 1 if task is in a syscall */ + bool local; /* local context needed */ enum audit_state state, current_state; unsigned int serial; /* serial number for record */ int major; /* syscall number */ diff --git a/kernel/auditsc.c b/kernel/auditsc.c index 67da23f6bebd..d4e061f95da8 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c @@ -925,11 +925,13 @@ static inline void audit_free_aux(struct audit_context *context) } } -static inline struct audit_context *audit_alloc_context(enum audit_state state) +static inline struct audit_context *audit_alloc_context(enum audit_state state, + gfp_t gfpflags) { struct audit_context *context; - context = kzalloc(sizeof(*context), GFP_KERNEL); + /* We can be called in atomic context via audit_tg() */ + context = kzalloc(sizeof(*context), gfpflags); if (!context) return NULL; context->state = state; @@ -965,7 +967,8 @@ int audit_alloc(struct task_struct *tsk) return 0; } - if (!(context = audit_alloc_context(state))) { + context = audit_alloc_context(state, GFP_KERNEL); + if (!context) { kfree(key); audit_log_lost("out of memory in audit_alloc"); return -ENOMEM; @@ -977,8 +980,27 @@ int audit_alloc(struct task_struct *tsk) return 0; } -static inline void audit_free_context(struct audit_context *context) +struct audit_context *audit_alloc_local(gfp_t gfpflags) { + struct audit_context *context = NULL; + + context = audit_alloc_context(AUDIT_RECORD_CONTEXT, gfpflags); + if (!context) { + audit_log_lost("out of memory in audit_alloc_local"); + goto out; + } + context->serial = audit_serial(); + ktime_get_coarse_real_ts64(&context->ctime); + context->local = true; +out: + return context; +} +EXPORT_SYMBOL(audit_alloc_local); + +void audit_free_context(struct audit_context *context) +{ + if (!context) + return; audit_free_module(context); audit_free_names(context); unroll_tree_refs(context, NULL, 0); @@ -989,6 +1011,7 @@ static inline void audit_free_context(struct audit_context *context) audit_proctitle_free(context); kfree(context); } +EXPORT_SYMBOL(audit_free_context); static int audit_log_pid_context(struct audit_context *context, pid_t pid, kuid_t auid, kuid_t uid, @@ -2210,7 +2233,7 @@ EXPORT_SYMBOL_GPL(__audit_inode_child); int auditsc_get_stamp(struct audit_context *ctx, struct timespec64 *t, unsigned int *serial) { - if (!ctx->in_syscall) + if (!ctx->in_syscall && !ctx->local) return 0; if (!ctx->serial) ctx->serial = audit_serial(); -- 2.29.2 -- Linux-audit mailing list Linux-audit@redhat.com https://listman.redhat.com/mailman/listinfo/linux-audit
next prev parent reply other threads:[~2021-05-13 20:31 UTC|newest] Thread overview: 111+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <20210513200807.15910-1-casey.ref@schaufler-ca.com> 2021-05-13 20:07 ` [PATCH v26 00/25] LSM: Module stacking for AppArmor Casey Schaufler 2021-05-13 20:07 ` Casey Schaufler 2021-05-13 20:07 ` [PATCH v26 01/25] LSM: Infrastructure management of the sock security Casey Schaufler 2021-05-13 20:07 ` Casey Schaufler 2021-05-13 20:07 ` [PATCH v26 02/25] LSM: Add the lsmblob data structure Casey Schaufler 2021-05-13 20:07 ` Casey Schaufler 2021-05-22 8:39 ` Mickaël Salaün 2021-05-22 8:39 ` Mickaël Salaün 2021-05-25 23:52 ` Casey Schaufler 2021-05-25 23:52 ` Casey Schaufler 2021-05-26 9:53 ` Mickaël Salaün 2021-05-26 9:53 ` Mickaël Salaün 2021-05-13 20:07 ` [PATCH v26 03/25] LSM: provide lsm name and id slot mappings Casey Schaufler 2021-05-13 20:07 ` Casey Schaufler 2021-05-14 19:00 ` Kees Cook 2021-05-14 19:00 ` Kees Cook 2021-05-21 20:18 ` Paul Moore 2021-05-21 20:18 ` Paul Moore 2021-05-13 20:07 ` [PATCH v26 04/25] IMA: avoid label collisions with stacked LSMs Casey Schaufler 2021-05-13 20:07 ` Casey Schaufler 2021-05-14 19:00 ` Kees Cook 2021-05-14 19:00 ` Kees Cook 2021-05-13 20:07 ` [PATCH v26 05/25] LSM: Use lsmblob in security_audit_rule_match Casey Schaufler 2021-05-13 20:07 ` Casey Schaufler 2021-05-13 20:07 ` [PATCH v26 06/25] LSM: Use lsmblob in security_kernel_act_as Casey Schaufler 2021-05-13 20:07 ` Casey Schaufler 2021-05-13 20:07 ` [PATCH v26 07/25] LSM: Use lsmblob in security_secctx_to_secid Casey Schaufler 2021-05-13 20:07 ` Casey Schaufler 2021-05-14 19:03 ` Kees Cook 2021-05-14 19:03 ` Kees Cook 2021-05-21 20:18 ` Paul Moore 2021-05-21 20:18 ` Paul Moore 2021-05-13 20:07 ` [PATCH v26 08/25] LSM: Use lsmblob in security_secid_to_secctx Casey Schaufler 2021-05-13 20:07 ` Casey Schaufler 2021-05-14 19:05 ` Kees Cook 2021-05-14 19:05 ` Kees Cook 2021-05-21 20:18 ` Paul Moore 2021-05-21 20:18 ` Paul Moore 2021-05-13 20:07 ` [PATCH v26 09/25] LSM: Use lsmblob in security_ipc_getsecid Casey Schaufler 2021-05-13 20:07 ` Casey Schaufler 2021-05-13 20:07 ` [PATCH v26 10/25] LSM: Use lsmblob in security_task_getsecid Casey Schaufler 2021-05-13 20:07 ` Casey Schaufler 2021-05-13 20:07 ` [PATCH v26 11/25] LSM: Use lsmblob in security_inode_getsecid Casey Schaufler 2021-05-13 20:07 ` Casey Schaufler 2021-05-13 20:07 ` [PATCH v26 12/25] LSM: Use lsmblob in security_cred_getsecid Casey Schaufler 2021-05-13 20:07 ` Casey Schaufler 2021-05-13 20:07 ` [PATCH v26 13/25] IMA: Change internal interfaces to use lsmblobs Casey Schaufler 2021-05-13 20:07 ` Casey Schaufler 2021-05-13 20:07 ` [PATCH v26 14/25] LSM: Specify which LSM to display Casey Schaufler 2021-05-13 20:07 ` Casey Schaufler 2021-05-14 19:23 ` Kees Cook 2021-05-14 19:23 ` Kees Cook 2021-05-17 19:52 ` Casey Schaufler 2021-05-17 19:52 ` Casey Schaufler 2021-05-21 20:19 ` Paul Moore 2021-05-21 20:19 ` Paul Moore 2021-05-13 20:07 ` [PATCH v26 15/25] LSM: Ensure the correct LSM context releaser Casey Schaufler 2021-05-13 20:07 ` Casey Schaufler 2021-05-21 20:19 ` Paul Moore 2021-05-21 20:19 ` Paul Moore 2021-05-13 20:07 ` [PATCH v26 16/25] LSM: Use lsmcontext in security_secid_to_secctx Casey Schaufler 2021-05-13 20:07 ` Casey Schaufler 2021-05-13 20:07 ` [PATCH v26 17/25] LSM: Use lsmcontext in security_inode_getsecctx Casey Schaufler 2021-05-13 20:07 ` Casey Schaufler 2021-05-14 19:24 ` Kees Cook 2021-05-14 19:24 ` Kees Cook 2021-05-13 20:08 ` [PATCH v26 18/25] LSM: security_secid_to_secctx in netlink netfilter Casey Schaufler 2021-05-13 20:08 ` Casey Schaufler 2021-05-21 20:19 ` Paul Moore 2021-05-21 20:19 ` Paul Moore 2021-05-13 20:08 ` [PATCH v26 19/25] NET: Store LSM netlabel data in a lsmblob Casey Schaufler 2021-05-13 20:08 ` Casey Schaufler 2021-05-13 20:08 ` [PATCH v26 20/25] LSM: Verify LSM display sanity in binder Casey Schaufler 2021-05-13 20:08 ` Casey Schaufler 2021-05-13 20:08 ` Casey Schaufler [this message] 2021-05-13 20:08 ` [PATCH v26 21/25] audit: add support for non-syscall auxiliary records Casey Schaufler 2021-05-21 20:19 ` Paul Moore 2021-05-21 20:19 ` Paul Moore 2021-05-13 20:08 ` [PATCH v26 22/25] Audit: Add new record for multiple process LSM attributes Casey Schaufler 2021-05-13 20:08 ` Casey Schaufler 2021-05-21 20:19 ` Paul Moore 2021-05-21 20:19 ` Paul Moore 2021-05-21 21:26 ` Richard Guy Briggs 2021-05-21 21:26 ` Richard Guy Briggs 2021-05-21 22:05 ` Casey Schaufler 2021-05-21 22:05 ` Casey Schaufler 2021-05-22 2:20 ` Paul Moore 2021-05-22 2:20 ` Paul Moore 2021-05-22 12:58 ` Richard Guy Briggs 2021-05-22 12:58 ` Richard Guy Briggs 2021-05-23 2:00 ` Steve Grubb 2021-05-24 15:53 ` Casey Schaufler 2021-05-24 16:06 ` Steve Grubb 2021-05-25 16:26 ` Casey Schaufler 2021-05-25 16:26 ` Casey Schaufler 2021-05-25 17:28 ` Casey Schaufler 2021-05-25 17:28 ` Casey Schaufler 2021-05-25 18:23 ` Richard Guy Briggs 2021-05-25 18:23 ` Richard Guy Briggs 2021-05-25 19:06 ` Casey Schaufler 2021-05-25 19:06 ` Casey Schaufler 2021-05-25 20:08 ` Richard Guy Briggs 2021-05-25 20:08 ` Richard Guy Briggs 2021-05-25 22:46 ` Casey Schaufler 2021-05-25 22:46 ` Casey Schaufler 2021-05-13 20:08 ` [PATCH v26 23/25] Audit: Add a new record for multiple object " Casey Schaufler 2021-05-13 20:08 ` Casey Schaufler 2021-05-13 20:08 ` [PATCH v26 24/25] LSM: Add /proc attr entry for full LSM context Casey Schaufler 2021-05-13 20:08 ` Casey Schaufler 2021-05-13 20:08 ` [PATCH v26 25/25] AppArmor: Remove the exclusive flag Casey Schaufler 2021-05-13 20:08 ` 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=20210513200807.15910-22-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=rgb@redhat.com \ --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.