aboutsummaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorRichard Guy Briggs <rgb@redhat.com>2019-01-22 17:06:39 -0500
committerPaul Moore <paul@paul-moore.com>2019-01-25 13:03:23 -0500
commit4b7d248b3a1de483ffe9d05c1debbf32a544164d (patch)
tree6b652f40d702f6b09c084676955312902c650900 /init
parent626abcd13d4ea2b67be3249a250046cf713f532a (diff)
downloadlinus-4b7d248b3a1de483ffe9d05c1debbf32a544164d.tar.gz
linus-4b7d248b3a1de483ffe9d05c1debbf32a544164d.tar.xz
linus-4b7d248b3a1de483ffe9d05c1debbf32a544164d.zip
audit: move loginuid and sessionid from CONFIG_AUDITSYSCALL to CONFIG_AUDIT
loginuid and sessionid (and audit_log_session_info) should be part of CONFIG_AUDIT scope and not CONFIG_AUDITSYSCALL since it is used in CONFIG_CHANGE, ANOM_LINK, FEATURE_CHANGE (and INTEGRITY_RULE), none of which are otherwise dependent on AUDITSYSCALL. Please see github issue https://github.com/linux-audit/audit-kernel/issues/104 Signed-off-by: Richard Guy Briggs <rgb@redhat.com> [PM: tweaked subject line for better grep'ing] Signed-off-by: Paul Moore <paul@paul-moore.com>
Diffstat (limited to 'init')
-rw-r--r--init/init_task.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/init/init_task.c b/init/init_task.c
index 5aebe3be4d7c..39c3109acc1a 100644
--- a/init/init_task.c
+++ b/init/init_task.c
@@ -121,7 +121,7 @@ struct task_struct init_task
.thread_pid = &init_struct_pid,
.thread_group = LIST_HEAD_INIT(init_task.thread_group),
.thread_node = LIST_HEAD_INIT(init_signals.thread_head),
-#ifdef CONFIG_AUDITSYSCALL
+#ifdef CONFIG_AUDIT
.loginuid = INVALID_UID,
.sessionid = AUDIT_SID_UNSET,
#endif