Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13f51e1c authored by Gao feng's avatar Gao feng Committed by Linus Torvalds
Browse files

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: default avatarGao feng <gaofeng@cn.fujitsu.com>
Cc: Eric Paris <eparis@redhat.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3f68613f

kernel/audit.c

+6 −6
Original line number Diff line number Diff line
@@ -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;

		}



	}

	loginuid = audit_get_loginuid(current);

	sessionid = audit_get_sessionid(current);

	security_task_getsecid(current, &sid);