1 files changed, 11 insertions, 19 deletions

diff --git a/kernel/audit.c b/kernel/audit.c
index eb0f9165b401..6977ea57a7e2 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -664,11 +664,11 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
                                 if (sid) {
                                         if (selinux_sid_to_string(
                                                         sid, &ctx, &len)) {
-                                                audit_log_format(ab, 
+                                                audit_log_format(ab,
                                                         " ssid=%u", sid);
                                                 /* Maybe call audit_panic? */
                                         } else
-                                                audit_log_format(ab, 
+                                                audit_log_format(ab,
                                                         " subj=%s", ctx);
                                         kfree(ctx);
                                 }
@@ -769,7 +769,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
                 sig_data->pid = audit_sig_pid;
                 memcpy(sig_data->ctx, ctx, len);
                 kfree(ctx);
-                audit_send_reply(NETLINK_CB(skb).pid, seq, AUDIT_SIGNAL_INFO, 
+                audit_send_reply(NETLINK_CB(skb).pid, seq, AUDIT_SIGNAL_INFO,
                                 0, 0, sig_data, sizeof(*sig_data) + len);
                 kfree(sig_data);
                 break;
@@ -847,18 +847,10 @@ static void audit_receive_skb(struct sk_buff *skb)
 }
 
 /* Receive messages from netlink socket. */
-static void audit_receive(struct sock *sk, int length)
+static void audit_receive(struct sk_buff  *skb)
 {
-        struct sk_buff  *skb;
-        unsigned int qlen;
-
         mutex_lock(&audit_cmd_mutex);
-
-        for (qlen = skb_queue_len(&sk->sk_receive_queue); qlen; qlen--) {
-                skb = skb_dequeue(&sk->sk_receive_queue);
-                audit_receive_skb(skb);
-                kfree_skb(skb);
-        }
+        audit_receive_skb(skb);
         mutex_unlock(&audit_cmd_mutex);
 }
 
@@ -876,8 +868,8 @@ static int __init audit_init(void)
 
         printk(KERN_INFO "audit: initializing netlink socket (%s)\n",
                audit_default ? "enabled" : "disabled");
-        audit_sock = netlink_kernel_create(NETLINK_AUDIT, 0, audit_receive,
-                                           NULL, THIS_MODULE);
+        audit_sock = netlink_kernel_create(&init_net, NETLINK_AUDIT, 0,
+                                           audit_receive, NULL, THIS_MODULE);
         if (!audit_sock)
                 audit_panic("cannot initialize netlink socket");
         else
@@ -1013,7 +1005,7 @@ unsigned int audit_serial(void)
         return ret;
 }
 
-static inline void audit_get_stamp(struct audit_context *ctx, 
+static inline void audit_get_stamp(struct audit_context *ctx,
                                    struct timespec *t, unsigned int *serial)
 {
         if (ctx)
@@ -1064,7 +1056,7 @@ struct audit_buffer *audit_log_start(struct audit_context *ctx, gfp_t gfp_mask,
         if (gfp_mask & __GFP_WAIT)
                 reserve = 0;
         else
-                reserve = 5; /* Allow atomic callers to go up to five 
+                reserve = 5; /* Allow atomic callers to go up to five
                                 entries over the normal backlog limit */
 
         while (audit_backlog_limit
@@ -1327,7 +1319,7 @@ void audit_log_d_path(struct audit_buffer *ab, const char *prefix,
         if (IS_ERR(p)) { /* Should never happen since we send PATH_MAX */
                 /* FIXME: can we save some information here? */
                 audit_log_format(ab, "<too long>");
-        } else 
+        } else
                 audit_log_untrustedstring(ab, p);
         kfree(path);
 }
@@ -1373,7 +1365,7 @@ void audit_log_end(struct audit_buffer *ab)
  * audit_log_vformat, and audit_log_end.  It may be called
  * in any context.
  */
-void audit_log(struct audit_context *ctx, gfp_t gfp_mask, int type, 
+void audit_log(struct audit_context *ctx, gfp_t gfp_mask, int type,
                const char *fmt, ...)
 {
         struct audit_buffer *ab;