audit: don't check if kauditd is valid every time

We only need to check if kauditd is valid after we start it, if kauditd
is invalid, we will set kauditd_task to NULL.  So next time, we will
start kauditd again.

It means if kauditd_task is not NULL,it must be valid.

Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
Cc: Eric Paris <eparis@redhat.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 6 insertions, 6 deletions

diff --git a/kernel/audit.c b/kernel/audit.c
index d596e5355f15..9816a1b96cfc 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -660,14 +660,14 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
 
         /* As soon as there's any sign of userspace auditd,
          * start kauditd to talk to it */
-        if (!kauditd_task)
+        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;
+                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);