Commit 8194a008 authored May 18, 2022 by Linus Torvalds

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

parents 6899c161 69e9cd66

include/linux/audit.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -339,7 +339,7 @@ static inline void audit_uring_entry(u8 op)
		}
		static inline void audit_uring_exit(int success, long code)
		{
		if (unlikely(!audit_dummy_context()))
		if (unlikely(audit_context()))
		__audit_uring_exit(success, code);
		}
		static inline void audit_syscall_entry(int major, unsigned long a0,

kernel/auditsc.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -1959,6 +1959,12 @@ void __audit_uring_exit(int success, long code)
		{
		struct audit_context *ctx = audit_context();

		if (ctx->dummy) {
		if (ctx->context != AUDIT_CTX_URING)
		return;
		goto out;
		}

		if (ctx->context == AUDIT_CTX_SYSCALL) {
		/*
		* NOTE: See the note in __audit_uring_entry() about the case