1 files changed, 4 insertions, 10 deletions

diff --git a/kernel/audit.c b/kernel/audit.c
index 1531efbd11e2..02a5d9eefa82 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -676,16 +676,6 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
         if (err)
                 return err;
 
-        /* As soon as there's any sign of userspace auditd,
-         * start kauditd to talk to it */
-        if (!kauditd_task)
-                kauditd_task = kthread_run(kauditd_thread, NULL, "kauditd");
-        if (IS_ERR(kauditd_task)) {
-                err = PTR_ERR(kauditd_task);
-                kauditd_task = NULL;
-                return err;
-        }
-
         loginuid = audit_get_loginuid(current);
         sessionid = audit_get_sessionid(current);
         security_task_getsecid(current, &sid);
@@ -974,6 +964,10 @@ static int __init audit_init(void)
         else
                 audit_sock->sk_sndtimeo = MAX_SCHEDULE_TIMEOUT;
 
+        kauditd_task = kthread_run(kauditd_thread, NULL, "kauditd");
+        if (IS_ERR(kauditd_task))
+                return PTR_ERR(kauditd_task);
+
         skb_queue_head_init(&audit_skb_queue);
         skb_queue_head_init(&audit_skb_hold_queue);
         audit_initialized = AUDIT_INITIALIZED;