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

Commit 57c521ce authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Linus Torvalds
Browse files

ifdef struct task_struct::security 



For those who don't care about CONFIG_SECURITY.

Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Cc: "Serge E. Hallyn" <serge@hallyn.com>
Cc: Casey Schaufler <casey@schaufler-ca.com>
Cc: James Morris <jmorris@namei.org>
Cc: Stephen Smalley <sds@tycho.nsa.gov>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 20510f2f

include/linux/sched.h

+2 −1
Original line number Diff line number Diff line
@@ -1044,8 +1044,9 @@ struct task_struct { 
	int (*notifier)(void *priv);

	void *notifier_data;

	sigset_t *notifier_mask;

	

#ifdef CONFIG_SECURITY

	void *security;

#endif

	struct audit_context *audit_context;

	seccomp_t seccomp;

kernel/fork.c

+2 −0
Original line number Diff line number Diff line
@@ -1079,7 +1079,9 @@ static struct task_struct *copy_process(unsigned long clone_flags, 
	do_posix_clock_monotonic_gettime(&p->start_time);

	p->real_start_time = p->start_time;

	monotonic_to_bootbased(&p->real_start_time);

#ifdef CONFIG_SECURITY

	p->security = NULL;

#endif

	p->io_context = NULL;

	p->io_wait = NULL;

	p->audit_context = NULL;