loadpin: simplify sysctls use with register_sysctl()
authorLuis Chamberlain <mcgrof@kernel.org>
Thu, 2 Mar 2023 20:28:20 +0000 (12:28 -0800)
committerLuis Chamberlain <mcgrof@kernel.org>
Thu, 13 Apr 2023 18:49:20 +0000 (11:49 -0700)
register_sysctl_paths() is not required, we can just use
register_sysctl() with the required path specified.

Reviewed-by: John Johansen <john.johansen@canonical.com>
Acked-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
security/loadpin/loadpin.c

index d73a281..c971464 100644 (file)
@@ -52,12 +52,6 @@ static bool deny_reading_verity_digests;
 #endif
 
 #ifdef CONFIG_SYSCTL
-static struct ctl_path loadpin_sysctl_path[] = {
-       { .procname = "kernel", },
-       { .procname = "loadpin", },
-       { }
-};
-
 static struct ctl_table loadpin_sysctl_table[] = {
        {
                .procname       = "enforce",
@@ -262,7 +256,7 @@ static int __init loadpin_init(void)
                enforce ? "" : "not ");
        parse_exclude();
 #ifdef CONFIG_SYSCTL
-       if (!register_sysctl_paths(loadpin_sysctl_path, loadpin_sysctl_table))
+       if (!register_sysctl("kernel/loadpin", loadpin_sysctl_table))
                pr_notice("sysctl registration failed!\n");
 #endif
        security_add_hooks(loadpin_hooks, ARRAY_SIZE(loadpin_hooks), "loadpin");