diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2020-07-29 12:35:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-07-29 12:35:36 -0700 |
| commit | d3590ebf6f91350192737dd1d1b219c05277f067 (patch) | |
| tree | cd2b4d9f397caa173558f5987af6e980f34334e5 /kernel/audit.c | |
| parent | Merge tag '9p-for-5.8-2' of git://github.com/martinetd/linux into master (diff) | |
| parent | revert: 1320a4052ea1 ("audit: trigger accompanying records when no rules present") (diff) | |
| download | linux-dev-d3590ebf6f91350192737dd1d1b219c05277f067.tar.xz linux-dev-d3590ebf6f91350192737dd1d1b219c05277f067.zip | |
Merge tag 'audit-pr-20200729' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit
Pull audit fixes from Paul Moore:
"One small audit fix that you can hopefully merge before v5.8 is
released. Unfortunately it is a revert of a patch that went in during
the v5.7 window and we just recently started to see some bug reports
relating to that commit.
We are working on a proper fix, but I'm not yet clear on when that
will be ready and we need to fix the v5.7 kernels anyway, so in the
interest of time a revert seemed like the best solution right now"
* tag 'audit-pr-20200729' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit:
revert: 1320a4052ea1 ("audit: trigger accompanying records when no rules present")
Diffstat (limited to 'kernel/audit.c')
| -rw-r--r-- | kernel/audit.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/audit.c b/kernel/audit.c index 8c201f414226..b2301bdc9773 100644 --- a/kernel/audit.c +++ b/kernel/audit.c @@ -1851,7 +1851,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); |