Commit 64bdc024 authored by Kenta.Tada@sony.com's avatar Kenta.Tada@sony.com Committed by Kees Cook
Browse files

seccomp: Fix CONFIG tests for Seccomp_filters 



Strictly speaking, seccomp filters are only used
when CONFIG_SECCOMP_FILTER.
This patch fixes the condition to enable "Seccomp_filters"
in /proc/$pid/status.

Signed-off-by: default avatarKenta Tada <Kenta.Tada@sony.com>
Fixes: c818c03b ("seccomp: Report number of loaded filters in /proc/$pid/status")
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/OSBPR01MB26772D245E2CF4F26B76A989F5669@OSBPR01MB2677.jpnprd01.prod.outlook.com
parent a38fd874

fs/proc/array.c

+2 −0
Original line number Diff line number Diff line
@@ -342,8 +342,10 @@ static inline void task_seccomp(struct seq_file *m, struct task_struct *p) 
	seq_put_decimal_ull(m, "NoNewPrivs:\t", task_no_new_privs(p));

#ifdef CONFIG_SECCOMP

	seq_put_decimal_ull(m, "\nSeccomp:\t", p->seccomp.mode);

#ifdef CONFIG_SECCOMP_FILTER

	seq_put_decimal_ull(m, "\nSeccomp_filters:\t",

			    atomic_read(&p->seccomp.filter_count));

#endif

#endif

	seq_puts(m, "\nSpeculation_Store_Bypass:\t");

	switch (arch_prctl_spec_ctrl_get(p, PR_SPEC_STORE_BYPASS)) {

init/init_task.c

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ struct task_struct init_task 
#ifdef CONFIG_SECURITY

	.security	= NULL,

#endif

#ifdef CONFIG_SECCOMP

#ifdef CONFIG_SECCOMP_FILTER

	.seccomp	= { .filter_count = ATOMIC_INIT(0) },

#endif

};