diff options
| author | Richard Guy Briggs <rgb@redhat.com> | 2013-09-16 16:45:59 +0200 |
|---|---|---|
| committer | Eric Paris <eparis@redhat.com> | 2014-01-14 04:27:53 +0100 |
| commit | ae887e0bdcddb9d7acd8f1eb7b7795b438aa4950 (patch) | |
| tree | 9695e92b2c51170e3075a9bf1d06d9e464acdf01 /kernel/audit.c | |
| parent | audit: reset audit backlog wait time after error recovery (diff) | |
| download | linux-ae887e0bdcddb9d7acd8f1eb7b7795b438aa4950.tar.xz linux-ae887e0bdcddb9d7acd8f1eb7b7795b438aa4950.zip | |
audit: make use of remaining sleep time from wait_for_auditd
If wait_for_auditd() times out, go immediately to the error function rather
than retesting the loop conditions.
Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
Signed-off-by: Eric Paris <eparis@redhat.com>
Diffstat (limited to 'kernel/audit.c')
| -rw-r--r-- | kernel/audit.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/kernel/audit.c b/kernel/audit.c index 6cd2ecca705b..09e287b1dc0e 100644 --- a/kernel/audit.c +++ b/kernel/audit.c @@ -1209,18 +1209,21 @@ static inline void audit_get_stamp(struct audit_context *ctx, /* * Wait for auditd to drain the queue a little */ -static void wait_for_auditd(unsigned long sleep_time) +static unsigned long wait_for_auditd(unsigned long sleep_time) { + unsigned long timeout = sleep_time; DECLARE_WAITQUEUE(wait, current); set_current_state(TASK_UNINTERRUPTIBLE); add_wait_queue(&audit_backlog_wait, &wait); if (audit_backlog_limit && skb_queue_len(&audit_skb_queue) > audit_backlog_limit) - schedule_timeout(sleep_time); + timeout = schedule_timeout(sleep_time); __set_current_state(TASK_RUNNING); remove_wait_queue(&audit_backlog_wait, &wait); + + return timeout; } /** @@ -1267,8 +1270,9 @@ struct audit_buffer *audit_log_start(struct audit_context *ctx, gfp_t gfp_mask, sleep_time = timeout_start + audit_backlog_wait_time - jiffies; if ((long)sleep_time > 0) { - wait_for_auditd(sleep_time); - continue; + sleep_time = wait_for_auditd(sleep_time); + if ((long)sleep_time > 0) + continue; } } if (audit_rate_check() && printk_ratelimit()) |