diff options
| author | Alexey Dobriyan <adobriyan@gmail.com> | 2007-10-16 23:31:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 08:43:07 -0700 |
| commit | 57c521ce6125e15e99e56c902cb8da96bee7b36d (patch) | |
| tree | d6337e711db2d3baf6dcff89cf2d2bc1dd12a62f | |
| parent | 20510f2f4e2dabb0ff6c13901807627ec9452f98 (diff) | |
| download | linux-3.10-57c521ce6125e15e99e56c902cb8da96bee7b36d.tar.gz linux-3.10-57c521ce6125e15e99e56c902cb8da96bee7b36d.tar.bz2 linux-3.10-57c521ce6125e15e99e56c902cb8da96bee7b36d.zip | |
ifdef struct task_struct::security
For those who don't care about CONFIG_SECURITY.
Signed-off-by: Alexey 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | include/linux/sched.h | 3 | ||||
| -rw-r--r-- | kernel/fork.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 774cb435c7d..3de5aa210fe 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -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; diff --git a/kernel/fork.c b/kernel/fork.c index 3e764f6f2be..490495a39c7 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -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; |