diff options
| author | Richard Guy Briggs <rgb@redhat.com> | 2015-02-23 15:38:00 -0500 |
|---|---|---|
| committer | Paul Moore <pmoore@redhat.com> | 2015-02-23 15:38:00 -0500 |
| commit | efef73a1a206c4b5e37e5c63a361243ed1603eff (patch) | |
| tree | 1d440a912d6edf3a144ffffbc222a83f4050a334 /kernel | |
| parent | a77ed4e5689627b0e9ac0a3532521b31c6daa99c (diff) | |
| download | linux-stable-efef73a1a206c4b5e37e5c63a361243ed1603eff.tar.gz linux-stable-efef73a1a206c4b5e37e5c63a361243ed1603eff.tar.bz2 linux-stable-efef73a1a206c4b5e37e5c63a361243ed1603eff.zip | |
audit: don't reset working wait time accidentally with auditd
During a queue overflow condition while we are waiting for auditd to drain the
queue to make room for regular messages, we don't want a successful auditd that
has bypassed the queue check to reset the backlog wait time.
Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
Signed-off-by: Paul Moore <pmoore@redhat.com>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/audit.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/audit.c b/kernel/audit.c index 2125cc40e921..59d4ceb3b2a6 100644 --- a/kernel/audit.c +++ b/kernel/audit.c @@ -1395,7 +1395,8 @@ struct audit_buffer *audit_log_start(struct audit_context *ctx, gfp_t gfp_mask, return NULL; } - audit_backlog_wait_time = audit_backlog_wait_time_master; + if (!reserve) + audit_backlog_wait_time = audit_backlog_wait_time_master; ab = audit_buffer_alloc(ctx, gfp_mask, type); if (!ab) { |