Commit ae887e0b authored by Richard Guy Briggs's avatar Richard Guy Briggs Committed by Eric Paris
Browse files

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: default avatarRichard Guy Briggs <rgb@redhat.com>
Signed-off-by: default avatarEric Paris <eparis@redhat.com>
parent e789e561

kernel/audit.c

+8 −4
Original line number Diff line number Diff line
@@ -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,7 +1270,8 @@ 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);

				sleep_time = wait_for_auditd(sleep_time);

				if ((long)sleep_time > 0)

					continue;

			}

		}