Commit 7e4910b9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'seccomp-v5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux 

Pull seccomp updates from Kees Cook:

 - Fix "cacheable" typo in comments (Cui GaoSheng)

 - Fix CONFIG for /proc/$pid/status Seccomp_filters (Kenta.Tada@sony.com)

* tag 'seccomp-v5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  seccomp: Fix "cacheable" typo in comments
  seccomp: Fix CONFIG tests for Seccomp_filters
parents ea6b2098 a3fc712c

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

};

kernel/seccomp.c

+1 −1
Original line number Diff line number Diff line
@@ -817,7 +817,7 @@ static void seccomp_cache_prepare_bitmap(struct seccomp_filter *sfilter, 
}



/**

 * seccomp_cache_prepare - emulate the filter to find cachable syscalls

 * seccomp_cache_prepare - emulate the filter to find cacheable syscalls

 * @sfilter: The seccomp filter

 *

 * Returns 0 if successful or -errno if error occurred.