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

Commit 3f2792ff authored by Al Viro's avatar Al Viro
Browse files

[PATCH] take filling ->pid, etc. out of audit_get_context() 



move that stuff downstream and into the only branch where it'll be
used.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 5ac3a9c2

kernel/auditsc.c

+12 −11
Original line number Diff line number Diff line
@@ -534,17 +534,7 @@ static inline struct audit_context *audit_get_context(struct task_struct *tsk, 
	}



get_context:

	context->pid = tsk->pid;

	context->ppid = sys_getppid();	/* sic.  tsk == current in all cases */

	context->uid = tsk->uid;

	context->gid = tsk->gid;

	context->euid = tsk->euid;

	context->suid = tsk->suid;

	context->fsuid = tsk->fsuid;

	context->egid = tsk->egid;

	context->sgid = tsk->sgid;

	context->fsgid = tsk->fsgid;

	context->personality = tsk->personality;



	tsk->audit_context = NULL;

	return context;

}
@@ -753,6 +743,17 @@ static void audit_log_exit(struct audit_context *context, struct task_struct *ts 
	const char *tty;



	/* tsk == current */

	context->pid = tsk->pid;

	context->ppid = sys_getppid();	/* sic.  tsk == current in all cases */

	context->uid = tsk->uid;

	context->gid = tsk->gid;

	context->euid = tsk->euid;

	context->suid = tsk->suid;

	context->fsuid = tsk->fsuid;

	context->egid = tsk->egid;

	context->sgid = tsk->sgid;

	context->fsgid = tsk->fsgid;

	context->personality = tsk->personality;



	ab = audit_log_start(context, GFP_KERNEL, AUDIT_SYSCALL);

	if (!ab)