Commit 98cfeb8d authored by Luis Chamberlain's avatar Luis Chamberlain
Browse files

yama: simplfy sysctls with register_sysctl() 



register_sysctl_paths() is only need if you have directories with
entries, simplify this by using register_sysctl().

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

security/yama/yama_lsm.c

+1 −7
Original line number Diff line number Diff line
@@ -447,12 +447,6 @@ static int yama_dointvec_minmax(struct ctl_table *table, int write, 


static int max_scope = YAMA_SCOPE_NO_ATTACH;



static struct ctl_path yama_sysctl_path[] = {

	{ .procname = "kernel", },

	{ .procname = "yama", },

	{ }

};



static struct ctl_table yama_sysctl_table[] = {

	{

		.procname       = "ptrace_scope",
@@ -467,7 +461,7 @@ static struct ctl_table yama_sysctl_table[] = { 
};

static void __init yama_init_sysctl(void)

{

	if (!register_sysctl_paths(yama_sysctl_path, yama_sysctl_table))

	if (!register_sysctl("kernel/yama", yama_sysctl_table))

		panic("Yama: sysctl registration failed.\n");

}

#else