diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-18 20:24:46 +0200 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-18 20:24:46 +0200 |
| commit | ce625a801664d8ed7344117bbb57510e4e0e872c (patch) | |
| tree | 50e6760a0b1b506b234700afddc7296b28918650 /kernel/auditsc.c | |
| parent | AUDIT: Fix livelock in audit_serial(). (diff) | |
| download | linux-ce625a801664d8ed7344117bbb57510e4e0e872c.tar.xz linux-ce625a801664d8ed7344117bbb57510e4e0e872c.zip | |
AUDIT: Reduce contention in audit_serial()
... by generating serial numbers only if an audit context is actually
_used_, rather than doing so at syscall entry even when the context
isn't necessarily marked auditable.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'kernel/auditsc.c')
| -rw-r--r-- | kernel/auditsc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/auditsc.c b/kernel/auditsc.c index 242d45e53738..46b45abceb9a 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c @@ -984,7 +984,7 @@ void audit_syscall_entry(struct task_struct *tsk, int arch, int major, if (likely(state == AUDIT_DISABLED)) return; - context->serial = audit_serial(); + context->serial = 0; context->ctime = CURRENT_TIME; context->in_syscall = 1; context->auditable = !!(state == AUDIT_RECORD_CONTEXT); @@ -1138,6 +1138,8 @@ void audit_inode(const char *name, const struct inode *inode, unsigned flags) void auditsc_get_stamp(struct audit_context *ctx, struct timespec *t, unsigned int *serial) { + if (!ctx->serial) + ctx->serial = audit_serial(); t->tv_sec = ctx->ctime.tv_sec; t->tv_nsec = ctx->ctime.tv_nsec; *serial = ctx->serial; |