Input: mousedev - fix race when creating mixed device

[~andy/linux] / kernel / auditsc.c

diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 425a8939be1a7e42e7e7bd5d9616e6d1db9c8748..90594c9f755213232e5282899c8547cd5c61c823 100644 (file)
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -1145,9 +1145,6 @@ static void audit_log_execve_info(struct audit_context *context,
        const char __user *p;
        char *buf;
 
-       if (context->execve.mm != current->mm)
-               return; /* execve failed, no additional info */
-
        p = (const char __user *)current->mm->arg_start;
 
        audit_log_format(*ab, "argc=%d", context->execve.argc);
@@ -1998,8 +1995,8 @@ static void audit_log_set_loginuid(kuid_t koldloginuid, kuid_t kloginuid,
 int audit_set_loginuid(kuid_t loginuid)
 {
        struct task_struct *task = current;
-       unsigned int sessionid = -1;
-       kuid_t oldloginuid, oldsessionid;
+       unsigned int oldsessionid, sessionid = (unsigned int)-1;
+       kuid_t oldloginuid;
        int rc;
 
        oldloginuid = audit_get_loginuid(current);
@@ -2144,7 +2141,6 @@ void __audit_bprm(struct linux_binprm *bprm)
 
        context->type = AUDIT_EXECVE;
        context->execve.argc = bprm->argc;
-       context->execve.mm = bprm->mm;
 }