Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit

Pull audit updates from Paul Moore:
 "Seven audit patches for 4.5, all very minor despite the diffstat.

  The diffstat churn for linux/audit.h can be attributed to needing to
  reshuffle the linux/audit.h header to fix the seccomp auditing issue
  (see the commit description for details).

  Besides the seccomp/audit fix, most of the fixes are around trying to
  improve the connection with the audit daemon and a Kconfig
  simplification.  Nothing crazy, and everything passes our little
  audit-testsuite"

* 'upstream' of git://git.infradead.org/users/pcmoore/audit:
  audit: always enable syscall auditing when supported and audit is enabled
  audit: force seccomp event logging to honor the audit_enabled flag
  audit: Delete unnecessary checks before two function calls
  audit: wake up threads if queue switched from limited to unlimited
  audit: include auditd's threads in audit_log_start() wait exception
  audit: remove audit_backlog_wait_overflow
  audit: don't needlessly reset valid wait time

1 files changed, 7 insertions, 10 deletions

diff --git a/kernel/audit.c b/kernel/audit.c
index 5ffcbd354a52..d6dd95cc59e6 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -110,7 +110,6 @@ static u32	audit_backlog_limit = 64;
 #define AUDIT_BACKLOG_WAIT_TIME (60 * HZ)
 static u32      audit_backlog_wait_time_master = AUDIT_BACKLOG_WAIT_TIME;
 static u32      audit_backlog_wait_time = AUDIT_BACKLOG_WAIT_TIME;
-static u32      audit_backlog_wait_overflow = 0;
 
 /* The identity of the user shutting down the audit system. */
 kuid_t          audit_sig_uid = INVALID_UID;
@@ -509,8 +508,7 @@ static void flush_hold_queue(void)
          * if auditd just disappeared but we
          * dequeued an skb we need to drop ref
          */
-        if (skb)
-                consume_skb(skb);
+        consume_skb(skb);
 }
 
 static int kauditd_thread(void *dummy)
@@ -524,7 +522,8 @@ static int kauditd_thread(void *dummy)
                 skb = skb_dequeue(&audit_skb_queue);
 
                 if (skb) {
-                        if (skb_queue_len(&audit_skb_queue) <= audit_backlog_limit)
+                        if (!audit_backlog_limit ||
+                            (skb_queue_len(&audit_skb_queue) <= audit_backlog_limit))
                                 wake_up(&audit_backlog_wait);
                         if (audit_pid)
                                 kauditd_send_skb(skb);
@@ -1232,9 +1231,7 @@ static void audit_buffer_free(struct audit_buffer *ab)
         if (!ab)
                 return;
 
-        if (ab->skb)
-                kfree_skb(ab->skb);
-
+        kfree_skb(ab->skb);
         spin_lock_irqsave(&audit_freelist_lock, flags);
         if (audit_freelist_count > AUDIT_MAXFREE)
                 kfree(ab);
@@ -1372,7 +1369,7 @@ struct audit_buffer *audit_log_start(struct audit_context *ctx, gfp_t gfp_mask,
                 return NULL;
 
         if (gfp_mask & __GFP_DIRECT_RECLAIM) {
-                if (audit_pid && audit_pid == current->pid)
+                if (audit_pid && audit_pid == current->tgid)
                         gfp_mask &= ~__GFP_DIRECT_RECLAIM;
                 else
                         reserve = 0;
@@ -1395,12 +1392,12 @@ struct audit_buffer *audit_log_start(struct audit_context *ctx, gfp_t gfp_mask,
                                 skb_queue_len(&audit_skb_queue),
                                 audit_backlog_limit);
                 audit_log_lost("backlog limit exceeded");
-                audit_backlog_wait_time = audit_backlog_wait_overflow;
+                audit_backlog_wait_time = 0;
                 wake_up(&audit_backlog_wait);
                 return NULL;
         }
 
-        if (!reserve)
+        if (!reserve && !audit_backlog_wait_time)
                 audit_backlog_wait_time = audit_backlog_wait_time_master;
 
         ab = audit_buffer_alloc(ctx, gfp_mask, type);