issue-138.diff

diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 3a8c9d7..2b1da00 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -990,9 +990,7 @@ static void audit_reset_context(struct audit_context *ctx)
 	ctx->uring_op = 0;
 	ctx->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);
-	ctx->return_valid = AUDITSC_INVALID;
 	audit_free_names(ctx);
 	if (ctx->state != AUDIT_STATE_RECORD) {
 		kfree(ctx->filterkey);
@@ -2004,9 +2002,9 @@ void __audit_uring_exit(int success, long code)
 	/* run through both filters to ensure we set the filterkey properly */
 	audit_filter_uring(current, ctx);
 	audit_filter_inodes(current, ctx);
+	audit_return_fixup(ctx, success, code);
 	if (ctx->current_state != AUDIT_STATE_RECORD)
 		goto out;
-	audit_return_fixup(ctx, success, code);
 	audit_log_exit();
 
 out: