Commit 02a6b455 authored by Luis Chamberlain's avatar Luis Chamberlain
Browse files

seccomp: simplify sysctls with register_sysctl_init() 



register_sysctl_paths() is only needed if you have childs (directories)
with entries. Just use register_sysctl_init() as it also does the
kmemleak check for you.

Acked-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
parent 98cfeb8d

kernel/seccomp.c

+1 −14
Original line number Diff line number Diff line
@@ -2368,12 +2368,6 @@ static int seccomp_actions_logged_handler(struct ctl_table *ro_table, int write, 
	return ret;

}



static struct ctl_path seccomp_sysctl_path[] = {

	{ .procname = "kernel", },

	{ .procname = "seccomp", },

	{ }

};



static struct ctl_table seccomp_sysctl_table[] = {

	{

		.procname	= "actions_avail",
@@ -2392,14 +2386,7 @@ static struct ctl_table seccomp_sysctl_table[] = { 


static int __init seccomp_sysctl_init(void)

{

	struct ctl_table_header *hdr;



	hdr = register_sysctl_paths(seccomp_sysctl_path, seccomp_sysctl_table);

	if (!hdr)

		pr_warn("sysctl registration failed\n");

	else

		kmemleak_not_leak(hdr);



	register_sysctl_init("kernel/seccomp", seccomp_sysctl_table);

	return 0;

}