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 v37 24/33] Audit: Create audit_stamp structure Date: Mon, 27 Jun 2022 17:56:02 -0700 [thread overview] Message-ID: <20220628005611.13106-25-casey@schaufler-ca.com> (raw) In-Reply-To: <20220628005611.13106-1-casey@schaufler-ca.com> Replace the timestamp and serial number pair used in audit records with a structure containing the two elements. Signed-off-by: Casey Schaufler <casey@schaufler-ca.com> Acked-by: Paul Moore <paul@paul-moore.com> --- kernel/audit.c | 17 +++++++++-------- kernel/audit.h | 13 +++++++++---- kernel/auditsc.c | 22 +++++++++------------- 3 files changed, 27 insertions(+), 25 deletions(-) diff --git a/kernel/audit.c b/kernel/audit.c index 99439dcc75fc..e4ee8ee63484 100644 --- a/kernel/audit.c +++ b/kernel/audit.c @@ -1822,11 +1822,11 @@ unsigned int audit_serial(void) } static inline void audit_get_stamp(struct audit_context *ctx, - struct timespec64 *t, unsigned int *serial) + struct audit_stamp *stamp) { - if (!ctx || !auditsc_get_stamp(ctx, t, serial)) { - ktime_get_coarse_real_ts64(t); - *serial = audit_serial(); + if (!ctx || !auditsc_get_stamp(ctx, stamp)) { + ktime_get_coarse_real_ts64(&stamp->ctime); + stamp->serial = audit_serial(); } } @@ -1849,8 +1849,7 @@ struct audit_buffer *audit_log_start(struct audit_context *ctx, gfp_t gfp_mask, int type) { struct audit_buffer *ab; - struct timespec64 t; - unsigned int serial; + struct audit_stamp stamp; if (audit_initialized != AUDIT_INITIALIZED) return NULL; @@ -1905,12 +1904,14 @@ struct audit_buffer *audit_log_start(struct audit_context *ctx, gfp_t gfp_mask, return NULL; } - audit_get_stamp(ab->ctx, &t, &serial); + audit_get_stamp(ab->ctx, &stamp); /* cancel dummy context to enable supporting records */ if (ctx) ctx->dummy = 0; audit_log_format(ab, "audit(%llu.%03lu:%u): ", - (unsigned long long)t.tv_sec, t.tv_nsec/1000000, serial); + (unsigned long long)stamp.ctime.tv_sec, + stamp.ctime.tv_nsec/1000000, + stamp.serial); return ab; } diff --git a/kernel/audit.h b/kernel/audit.h index 4af63e7dde17..44cabf7ea660 100644 --- a/kernel/audit.h +++ b/kernel/audit.h @@ -99,6 +99,12 @@ struct audit_proctitle { char *value; /* the cmdline field */ }; +/* A timestamp/serial pair to identify an event */ +struct audit_stamp { + struct timespec64 ctime; /* time of syscall entry */ + unsigned int serial; /* serial number for record */ +}; + /* The per-task audit context. */ struct audit_context { int dummy; /* must be the first element */ @@ -108,10 +114,9 @@ struct audit_context { AUDIT_CTX_URING, /* in use by io_uring */ } context; enum audit_state state, current_state; - unsigned int serial; /* serial number for record */ + struct audit_stamp stamp; /* event identifier */ int major; /* syscall number */ int uring_op; /* uring operation */ - struct timespec64 ctime; /* time of syscall entry */ unsigned long argv[4]; /* syscall arguments */ long return_code;/* syscall return code */ u64 prio; @@ -265,7 +270,7 @@ extern void audit_put_tty(struct tty_struct *tty); #ifdef CONFIG_AUDITSYSCALL extern unsigned int audit_serial(void); extern int auditsc_get_stamp(struct audit_context *ctx, - struct timespec64 *t, unsigned int *serial); + struct audit_stamp *stamp); extern void audit_put_watch(struct audit_watch *watch); extern void audit_get_watch(struct audit_watch *watch); @@ -306,7 +311,7 @@ extern void audit_filter_inodes(struct task_struct *tsk, struct audit_context *ctx); extern struct list_head *audit_killed_trees(void); #else /* CONFIG_AUDITSYSCALL */ -#define auditsc_get_stamp(c, t, s) 0 +#define auditsc_get_stamp(c, s) 0 #define audit_put_watch(w) do { } while (0) #define audit_get_watch(w) do { } while (0) #define audit_to_watch(k, p, l, o) (-EINVAL) diff --git a/kernel/auditsc.c b/kernel/auditsc.c index 4f141655ac0b..539469bf1aa3 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c @@ -992,10 +992,10 @@ static void audit_reset_context(struct audit_context *ctx) */ ctx->current_state = ctx->state; - ctx->serial = 0; + ctx->stamp.serial = 0; ctx->major = 0; ctx->uring_op = 0; - ctx->ctime = (struct timespec64){ .tv_sec = 0, .tv_nsec = 0 }; + ctx->stamp.ctime = (struct timespec64){ .tv_sec = 0, .tv_nsec = 0 }; memset(ctx->argv, 0, sizeof(ctx->argv)); ctx->return_code = 0; ctx->prio = (ctx->state == AUDIT_STATE_RECORD ? ~0ULL : 0); @@ -1950,7 +1950,7 @@ void __audit_uring_entry(u8 op) ctx->context = AUDIT_CTX_URING; ctx->current_state = ctx->state; - ktime_get_coarse_real_ts64(&ctx->ctime); + ktime_get_coarse_real_ts64(&ctx->stamp.ctime); } /** @@ -2072,7 +2072,7 @@ void __audit_syscall_entry(int major, unsigned long a1, unsigned long a2, context->argv[3] = a4; context->context = AUDIT_CTX_SYSCALL; context->current_state = state; - ktime_get_coarse_real_ts64(&context->ctime); + ktime_get_coarse_real_ts64(&context->stamp.ctime); } /** @@ -2541,21 +2541,17 @@ EXPORT_SYMBOL_GPL(__audit_inode_child); /** * auditsc_get_stamp - get local copies of audit_context values * @ctx: audit_context for the task - * @t: timespec64 to store time recorded in the audit_context - * @serial: serial value that is recorded in the audit_context + * @stamp: timestamp to record * * Also sets the context as auditable. */ -int auditsc_get_stamp(struct audit_context *ctx, - struct timespec64 *t, unsigned int *serial) +int auditsc_get_stamp(struct audit_context *ctx, struct audit_stamp *stamp) { if (ctx->context == AUDIT_CTX_UNUSED) return 0; - if (!ctx->serial) - ctx->serial = audit_serial(); - t->tv_sec = ctx->ctime.tv_sec; - t->tv_nsec = ctx->ctime.tv_nsec; - *serial = ctx->serial; + if (!ctx->stamp.serial) + ctx->stamp.serial = audit_serial(); + *stamp = ctx->stamp; if (!ctx->prio) { ctx->prio = 1; ctx->current_state = AUDIT_STATE_RECORD; -- 2.36.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 Subject: [PATCH v37 24/33] Audit: Create audit_stamp structure Date: Mon, 27 Jun 2022 17:56:02 -0700 [thread overview] Message-ID: <20220628005611.13106-25-casey@schaufler-ca.com> (raw) In-Reply-To: <20220628005611.13106-1-casey@schaufler-ca.com> Replace the timestamp and serial number pair used in audit records with a structure containing the two elements. Signed-off-by: Casey Schaufler <casey@schaufler-ca.com> Acked-by: Paul Moore <paul@paul-moore.com> --- kernel/audit.c | 17 +++++++++-------- kernel/audit.h | 13 +++++++++---- kernel/auditsc.c | 22 +++++++++------------- 3 files changed, 27 insertions(+), 25 deletions(-) diff --git a/kernel/audit.c b/kernel/audit.c index 99439dcc75fc..e4ee8ee63484 100644 --- a/kernel/audit.c +++ b/kernel/audit.c @@ -1822,11 +1822,11 @@ unsigned int audit_serial(void) } static inline void audit_get_stamp(struct audit_context *ctx, - struct timespec64 *t, unsigned int *serial) + struct audit_stamp *stamp) { - if (!ctx || !auditsc_get_stamp(ctx, t, serial)) { - ktime_get_coarse_real_ts64(t); - *serial = audit_serial(); + if (!ctx || !auditsc_get_stamp(ctx, stamp)) { + ktime_get_coarse_real_ts64(&stamp->ctime); + stamp->serial = audit_serial(); } } @@ -1849,8 +1849,7 @@ struct audit_buffer *audit_log_start(struct audit_context *ctx, gfp_t gfp_mask, int type) { struct audit_buffer *ab; - struct timespec64 t; - unsigned int serial; + struct audit_stamp stamp; if (audit_initialized != AUDIT_INITIALIZED) return NULL; @@ -1905,12 +1904,14 @@ struct audit_buffer *audit_log_start(struct audit_context *ctx, gfp_t gfp_mask, return NULL; } - audit_get_stamp(ab->ctx, &t, &serial); + audit_get_stamp(ab->ctx, &stamp); /* cancel dummy context to enable supporting records */ if (ctx) ctx->dummy = 0; audit_log_format(ab, "audit(%llu.%03lu:%u): ", - (unsigned long long)t.tv_sec, t.tv_nsec/1000000, serial); + (unsigned long long)stamp.ctime.tv_sec, + stamp.ctime.tv_nsec/1000000, + stamp.serial); return ab; } diff --git a/kernel/audit.h b/kernel/audit.h index 4af63e7dde17..44cabf7ea660 100644 --- a/kernel/audit.h +++ b/kernel/audit.h @@ -99,6 +99,12 @@ struct audit_proctitle { char *value; /* the cmdline field */ }; +/* A timestamp/serial pair to identify an event */ +struct audit_stamp { + struct timespec64 ctime; /* time of syscall entry */ + unsigned int serial; /* serial number for record */ +}; + /* The per-task audit context. */ struct audit_context { int dummy; /* must be the first element */ @@ -108,10 +114,9 @@ struct audit_context { AUDIT_CTX_URING, /* in use by io_uring */ } context; enum audit_state state, current_state; - unsigned int serial; /* serial number for record */ + struct audit_stamp stamp; /* event identifier */ int major; /* syscall number */ int uring_op; /* uring operation */ - struct timespec64 ctime; /* time of syscall entry */ unsigned long argv[4]; /* syscall arguments */ long return_code;/* syscall return code */ u64 prio; @@ -265,7 +270,7 @@ extern void audit_put_tty(struct tty_struct *tty); #ifdef CONFIG_AUDITSYSCALL extern unsigned int audit_serial(void); extern int auditsc_get_stamp(struct audit_context *ctx, - struct timespec64 *t, unsigned int *serial); + struct audit_stamp *stamp); extern void audit_put_watch(struct audit_watch *watch); extern void audit_get_watch(struct audit_watch *watch); @@ -306,7 +311,7 @@ extern void audit_filter_inodes(struct task_struct *tsk, struct audit_context *ctx); extern struct list_head *audit_killed_trees(void); #else /* CONFIG_AUDITSYSCALL */ -#define auditsc_get_stamp(c, t, s) 0 +#define auditsc_get_stamp(c, s) 0 #define audit_put_watch(w) do { } while (0) #define audit_get_watch(w) do { } while (0) #define audit_to_watch(k, p, l, o) (-EINVAL) diff --git a/kernel/auditsc.c b/kernel/auditsc.c index 4f141655ac0b..539469bf1aa3 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c @@ -992,10 +992,10 @@ static void audit_reset_context(struct audit_context *ctx) */ ctx->current_state = ctx->state; - ctx->serial = 0; + ctx->stamp.serial = 0; ctx->major = 0; ctx->uring_op = 0; - ctx->ctime = (struct timespec64){ .tv_sec = 0, .tv_nsec = 0 }; + ctx->stamp.ctime = (struct timespec64){ .tv_sec = 0, .tv_nsec = 0 }; memset(ctx->argv, 0, sizeof(ctx->argv)); ctx->return_code = 0; ctx->prio = (ctx->state == AUDIT_STATE_RECORD ? ~0ULL : 0); @@ -1950,7 +1950,7 @@ void __audit_uring_entry(u8 op) ctx->context = AUDIT_CTX_URING; ctx->current_state = ctx->state; - ktime_get_coarse_real_ts64(&ctx->ctime); + ktime_get_coarse_real_ts64(&ctx->stamp.ctime); } /** @@ -2072,7 +2072,7 @@ void __audit_syscall_entry(int major, unsigned long a1, unsigned long a2, context->argv[3] = a4; context->context = AUDIT_CTX_SYSCALL; context->current_state = state; - ktime_get_coarse_real_ts64(&context->ctime); + ktime_get_coarse_real_ts64(&context->stamp.ctime); } /** @@ -2541,21 +2541,17 @@ EXPORT_SYMBOL_GPL(__audit_inode_child); /** * auditsc_get_stamp - get local copies of audit_context values * @ctx: audit_context for the task - * @t: timespec64 to store time recorded in the audit_context - * @serial: serial value that is recorded in the audit_context + * @stamp: timestamp to record * * Also sets the context as auditable. */ -int auditsc_get_stamp(struct audit_context *ctx, - struct timespec64 *t, unsigned int *serial) +int auditsc_get_stamp(struct audit_context *ctx, struct audit_stamp *stamp) { if (ctx->context == AUDIT_CTX_UNUSED) return 0; - if (!ctx->serial) - ctx->serial = audit_serial(); - t->tv_sec = ctx->ctime.tv_sec; - t->tv_nsec = ctx->ctime.tv_nsec; - *serial = ctx->serial; + if (!ctx->stamp.serial) + ctx->stamp.serial = audit_serial(); + *stamp = ctx->stamp; if (!ctx->prio) { ctx->prio = 1; ctx->current_state = AUDIT_STATE_RECORD; -- 2.36.1 -- Linux-audit mailing list Linux-audit@redhat.com https://listman.redhat.com/mailman/listinfo/linux-audit
next prev parent reply other threads:[~2022-06-28 1:12 UTC|newest] Thread overview: 78+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <20220628005611.13106-1-casey.ref@schaufler-ca.com> 2022-06-28 0:55 ` [PATCH v37 00/33] LSM: Module stacking for AppArmor Casey Schaufler 2022-06-28 0:55 ` Casey Schaufler 2022-06-28 0:55 ` [PATCH v37 01/33] integrity: disassociate ima_filter_rule from security_audit_rule Casey Schaufler 2022-06-28 0:55 ` Casey Schaufler 2022-06-28 0:55 ` [PATCH v37 02/33] LSM: Infrastructure management of the sock security Casey Schaufler 2022-06-28 0:55 ` Casey Schaufler 2022-06-28 0:55 ` [PATCH v37 03/33] LSM: Add the lsmblob data structure Casey Schaufler 2022-06-28 0:55 ` Casey Schaufler 2022-06-28 0:55 ` [PATCH v37 04/33] LSM: provide lsm name and id slot mappings Casey Schaufler 2022-06-28 0:55 ` Casey Schaufler 2022-06-28 0:55 ` [PATCH v37 05/33] IMA: avoid label collisions with stacked LSMs Casey Schaufler 2022-06-28 0:55 ` Casey Schaufler 2022-06-28 0:55 ` [PATCH v37 06/33] LSM: Use lsmblob in security_audit_rule_match Casey Schaufler 2022-06-28 0:55 ` Casey Schaufler 2022-06-28 0:55 ` [PATCH v37 07/33] LSM: Use lsmblob in security_kernel_act_as Casey Schaufler 2022-06-28 0:55 ` Casey Schaufler 2022-06-28 0:55 ` [PATCH v37 08/33] LSM: Use lsmblob in security_secctx_to_secid Casey Schaufler 2022-06-28 0:55 ` Casey Schaufler 2022-06-28 0:55 ` [PATCH v37 09/33] LSM: Use lsmblob in security_secid_to_secctx Casey Schaufler 2022-06-28 0:55 ` Casey Schaufler 2022-06-28 0:55 ` [PATCH v37 10/33] LSM: Use lsmblob in security_ipc_getsecid Casey Schaufler 2022-06-28 0:55 ` Casey Schaufler 2022-06-28 0:55 ` [PATCH v37 11/33] LSM: Use lsmblob in security_current_getsecid Casey Schaufler 2022-06-28 0:55 ` Casey Schaufler 2022-06-28 0:55 ` [PATCH v37 12/33] LSM: Use lsmblob in security_inode_getsecid Casey Schaufler 2022-06-28 0:55 ` Casey Schaufler 2022-06-28 0:55 ` [PATCH v37 13/33] LSM: Use lsmblob in security_cred_getsecid Casey Schaufler 2022-06-28 0:55 ` Casey Schaufler 2022-06-28 0:55 ` [PATCH v37 14/33] LSM: Specify which LSM to display Casey Schaufler 2022-06-28 0:55 ` Casey Schaufler 2022-06-28 0:55 ` [PATCH v37 15/33] LSM: Ensure the correct LSM context releaser Casey Schaufler 2022-06-28 0:55 ` Casey Schaufler 2022-06-28 0:55 ` [PATCH v37 16/33] LSM: Use lsmcontext in security_secid_to_secctx Casey Schaufler 2022-06-28 0:55 ` Casey Schaufler 2022-06-28 0:55 ` [PATCH v37 17/33] LSM: Use lsmcontext in security_inode_getsecctx Casey Schaufler 2022-06-28 0:55 ` Casey Schaufler 2022-06-28 0:55 ` [PATCH v37 18/33] LSM: Use lsmcontext in security_dentry_init_security Casey Schaufler 2022-06-28 0:55 ` Casey Schaufler 2022-06-28 5:36 ` kernel test robot 2022-06-28 5:36 ` kernel test robot 2022-06-28 8:44 ` kernel test robot 2022-06-28 8:44 ` kernel test robot 2022-06-28 11:24 ` kernel test robot 2022-06-28 11:24 ` kernel test robot 2022-06-28 0:55 ` [PATCH v37 19/33] LSM: security_secid_to_secctx in netlink netfilter Casey Schaufler 2022-06-28 0:55 ` Casey Schaufler 2022-06-28 0:55 ` [PATCH v37 20/33] NET: Store LSM netlabel data in a lsmblob Casey Schaufler 2022-06-28 0:55 ` Casey Schaufler 2022-06-28 0:55 ` [PATCH v37 21/33] binder: Pass LSM identifier for confirmation Casey Schaufler 2022-06-28 0:55 ` Casey Schaufler 2022-06-28 0:56 ` [PATCH v37 22/33] LSM: security_secid_to_secctx module selection Casey Schaufler 2022-06-28 0:56 ` Casey Schaufler 2022-06-28 0:56 ` [PATCH v37 23/33] Audit: Keep multiple LSM data in audit_names Casey Schaufler 2022-06-28 0:56 ` Casey Schaufler 2022-06-28 0:56 ` Casey Schaufler [this message] 2022-06-28 0:56 ` [PATCH v37 24/33] Audit: Create audit_stamp structure Casey Schaufler 2022-06-28 0:56 ` [PATCH v37 25/33] LSM: Add a function to report multiple LSMs Casey Schaufler 2022-06-28 0:56 ` Casey Schaufler 2022-06-28 0:56 ` [PATCH v37 26/33] Audit: Allow multiple records in an audit_buffer Casey Schaufler 2022-06-28 0:56 ` Casey Schaufler 2022-06-28 0:56 ` [PATCH v37 27/33] Audit: Add record for multiple task security contexts Casey Schaufler 2022-06-28 0:56 ` Casey Schaufler 2022-06-28 0:56 ` [PATCH v37 28/33] audit: multiple subject lsm values for netlabel Casey Schaufler 2022-06-28 0:56 ` Casey Schaufler 2022-06-28 0:56 ` [PATCH v37 29/33] Audit: Add record for multiple object contexts Casey Schaufler 2022-06-28 0:56 ` Casey Schaufler 2022-06-28 0:56 ` [PATCH v37 30/33] netlabel: Use a struct lsmblob in audit data Casey Schaufler 2022-06-28 0:56 ` Casey Schaufler 2022-06-28 0:56 ` [PATCH v37 31/33] LSM: Removed scaffolding function lsmcontext_init Casey Schaufler 2022-06-28 0:56 ` Casey Schaufler 2022-06-28 0:56 ` [PATCH v37 32/33] LSM: Add /proc attr entry for full LSM context Casey Schaufler 2022-06-28 0:56 ` Casey Schaufler 2022-06-28 0:56 ` [PATCH v37 33/33] AppArmor: Remove the exclusive flag Casey Schaufler 2022-06-28 0:56 ` Casey Schaufler 2022-07-12 21:42 ` [PATCH v37 00/33] LSM: Module stacking for AppArmor John Johansen 2022-07-12 21:42 ` John Johansen 2022-07-12 21:58 ` Casey Schaufler 2022-07-12 21:58 ` 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=20220628005611.13106-25-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: 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.