Merge branch 'stable/for-linus-5.6' of git://git.kernel.org/pub/scm/linux/kernel...

[linux.git] / security / keys / sysctl.c

diff --git a/security/keys/sysctl.c b/security/keys/sysctl.c
index dd1e21fab827a51fd66a7363e9463f5c197aeaa0..b46b651b3c4cc65bcb0409e9a3e3c1e74604ac9d 100644 (file)
--- a/security/keys/sysctl.c
+++ b/security/keys/sysctl.c
@@ -9,8 +9,6 @@
 #include <linux/sysctl.h>
 #include "internal.h"
 
-static const int zero, one = 1, max = INT_MAX;
-
 struct ctl_table key_sysctls[] = {
        {
                .procname = "maxkeys",
@@ -18,8 +16,8 @@ struct ctl_table key_sysctls[] = {
                .maxlen = sizeof(unsigned),
                .mode = 0644,
                .proc_handler = proc_dointvec_minmax,
-               .extra1 = (void *) &one,
-               .extra2 = (void *) &max,
+               .extra1 = (void *) SYSCTL_ONE,
+               .extra2 = (void *) SYSCTL_INT_MAX,
        },
        {
                .procname = "maxbytes",
@@ -27,8 +25,8 @@ struct ctl_table key_sysctls[] = {
                .maxlen = sizeof(unsigned),
                .mode = 0644,
                .proc_handler = proc_dointvec_minmax,
-               .extra1 = (void *) &one,
-               .extra2 = (void *) &max,
+               .extra1 = (void *) SYSCTL_ONE,
+               .extra2 = (void *) SYSCTL_INT_MAX,
        },
        {
                .procname = "root_maxkeys",
@@ -36,8 +34,8 @@ struct ctl_table key_sysctls[] = {
                .maxlen = sizeof(unsigned),
                .mode = 0644,
                .proc_handler = proc_dointvec_minmax,
-               .extra1 = (void *) &one,
-               .extra2 = (void *) &max,
+               .extra1 = (void *) SYSCTL_ONE,
+               .extra2 = (void *) SYSCTL_INT_MAX,
        },
        {
                .procname = "root_maxbytes",
@@ -45,8 +43,8 @@ struct ctl_table key_sysctls[] = {
                .maxlen = sizeof(unsigned),
                .mode = 0644,
                .proc_handler = proc_dointvec_minmax,
-               .extra1 = (void *) &one,
-               .extra2 = (void *) &max,
+               .extra1 = (void *) SYSCTL_ONE,
+               .extra2 = (void *) SYSCTL_INT_MAX,
        },
        {
                .procname = "gc_delay",
@@ -54,8 +52,8 @@ struct ctl_table key_sysctls[] = {
                .maxlen = sizeof(unsigned),
                .mode = 0644,
                .proc_handler = proc_dointvec_minmax,
-               .extra1 = (void *) &zero,
-               .extra2 = (void *) &max,
+               .extra1 = (void *) SYSCTL_ZERO,
+               .extra2 = (void *) SYSCTL_INT_MAX,
        },
 #ifdef CONFIG_PERSISTENT_KEYRINGS
        {
@@ -64,8 +62,8 @@ struct ctl_table key_sysctls[] = {
                .maxlen = sizeof(unsigned),
                .mode = 0644,
                .proc_handler = proc_dointvec_minmax,
-               .extra1 = (void *) &zero,
-               .extra2 = (void *) &max,
+               .extra1 = (void *) SYSCTL_ZERO,
+               .extra2 = (void *) SYSCTL_INT_MAX,
        },
 #endif
        { }