lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

audit: make use of remaining sleep time from wait_for_auditd

Browse Source 
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>
This commit is contained in:
Richard Guy Briggs
2013-09-16 10:45:59 -04:00
committed by Eric Paris
parent e789e561a5
commit ae887e0bdc
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
kernel/audit.c
View File

@@ -1209,18 +1209,21 @@ static inline void audit_get_stamp(struct audit_context *ctx,
/* /*
* Wait for auditd to drain the queue a little * 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); DECLARE_WAITQUEUE(wait, current);
set_current_state(TASK_UNINTERRUPTIBLE); set_current_state(TASK_UNINTERRUPTIBLE);
add_wait_queue(&audit_backlog_wait, &wait); add_wait_queue(&audit_backlog_wait, &wait);
if (audit_backlog_limit && if (audit_backlog_limit &&
skb_queue_len(&audit_skb_queue) > 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); __set_current_state(TASK_RUNNING);
remove_wait_queue(&audit_backlog_wait, &wait); 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 - sleep_time = timeout_start + audit_backlog_wait_time -
jiffies; jiffies;
if ((long)sleep_time > 0) { if ((long)sleep_time > 0) {
wait_for_auditd(sleep_time); sleep_time = wait_for_auditd(sleep_time);
continue; if ((long)sleep_time > 0)
continue;
} }
} }
if (audit_rate_check() && printk_ratelimit()) if (audit_rate_check() && printk_ratelimit())