The patch titled
Subject: audit: don't check if kauditd is valid every time
has been removed from the -mm tree. Its filename was
audit-dont-check-if-kauditd-is-valid-every-time.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Gao feng <gaofeng@xxxxxxxxxxxxxx>
Subject: 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@xxxxxxxxxxxxxx>
Cc: Eric Paris <eparis@xxxxxxxxxx>
Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/audit.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff -puN kernel/audit.c~audit-dont-check-if-kauditd-is-valid-every-time kernel/audit.c
--- a/kernel/audit.c~audit-dont-check-if-kauditd-is-valid-every-time
+++ a/kernel/audit.c
@@ -660,14 +660,14 @@ static int audit_receive_msg(struct sk_b
/* 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);
_
Patches currently in -mm which might be from gaofeng@xxxxxxxxxxxxxx are
origin.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
