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

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
...@@ -447,12 +447,6 @@ static int yama_dointvec_minmax(struct ctl_table *table, int write, ...@@ -447,12 +447,6 @@ static int yama_dointvec_minmax(struct ctl_table *table, int write,
static int max_scope = YAMA_SCOPE_NO_ATTACH; 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[] = { static struct ctl_table yama_sysctl_table[] = {
{ {
.procname = "ptrace_scope", .procname = "ptrace_scope",
...@@ -467,7 +461,7 @@ static struct ctl_table yama_sysctl_table[] = { ...@@ -467,7 +461,7 @@ static struct ctl_table yama_sysctl_table[] = {
}; };
static void __init yama_init_sysctl(void) 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"); panic("Yama: sysctl registration failed.\n");
} }
#else #else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment