summaryrefslogtreecommitdiff
path: root/kernel/audit.c
diff options
context:
space:
mode:
authorPaul Moore <paul@paul-moore.com>2020-07-28 15:33:21 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-08-05 09:58:36 +0200
commita5e79834a5cd304ba114fa4b05d75f10a4dce80e (patch)
tree7db60dcde85dd34530e4500c9ef8297694b63a48 /kernel/audit.c
parentbeab956bdc0add5371e52d29c0d6f840c1f55609 (diff)
revert: 1320a4052ea1 ("audit: trigger accompanying records when no rules present")
commit 8ac68dc455d9d18241d44b96800d73229029ed34 upstream. Unfortunately the commit listed in the subject line above failed to ensure that the task's audit_context was properly initialized/set before enabling the "accompanying records". Depending on the situation, the resulting audit_context could have invalid values in some of it's fields which could cause a kernel panic/oops when the task/syscall exists and the audit records are generated. We will revisit the original patch, with the necessary fixes, in a future kernel but right now we just want to fix the kernel panic with the least amount of added risk. Cc: stable@vger.kernel.org Fixes: 1320a4052ea1 ("audit: trigger accompanying records when no rules present") Reported-by: j2468h@googlemail.com Signed-off-by: Paul Moore <paul@paul-moore.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/audit.c')
-rw-r--r--kernel/audit.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/audit.c b/kernel/audit.c
index f711f424a28a..0aa0e00e4f83 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -1811,7 +1811,6 @@ struct audit_buffer *audit_log_start(struct audit_context *ctx, gfp_t gfp_mask,
}
audit_get_stamp(ab->ctx, &t, &serial);
- audit_clear_dummy(ab->ctx);
audit_log_format(ab, "audit(%llu.%03lu:%u): ",
(unsigned long long)t.tv_sec, t.tv_nsec/1000000, serial);