Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'audit-pr-20220518' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit
Pull audit fix from Paul Moore:
"A single audit patch to fix a problem where a task's audit_context was
not being properly reset with io_uring"
* tag 'audit-pr-20220518' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit:
audit,io_uring,io-wq: call __audit_uring_exit for dummy contexts
+7
-1
+1
-1
include/linux/audit.h
+1
-1
include/linux/audit.h
···
339
339
}
340
340
static inline void audit_uring_exit(int success, long code)
341
341
{
342
-
if (unlikely(!audit_dummy_context()))
342
+
if (unlikely(audit_context()))
343
343
__audit_uring_exit(success, code);
344
344
}
345
345
static inline void audit_syscall_entry(int major, unsigned long a0,
+6
kernel/auditsc.c
+6
kernel/auditsc.c
···
1959
1959
{
1960
1960
struct audit_context *ctx = audit_context();
1961
1961
1962
+
if (ctx->dummy) {
1963
+
if (ctx->context != AUDIT_CTX_URING)
1964
+
return;
1965
+
goto out;
1966
+
}
1967
+
1962
1968
if (ctx->context == AUDIT_CTX_SYSCALL) {
1963
1969
/*
1964
1970
* NOTE: See the note in __audit_uring_entry() about the case