proc/sysctl: add shared variables for range check

In the sysctl code the proc_dointvec_minmax() function is often used to
validate the user supplied value between an allowed range.  This
function uses the extra1 and extra2 members from struct ctl_table as
minimum and maximum allowed value.

On sysctl handler declaration, in every source file there are some
readonly variables containing just an integer which address is assigned
to the extra1 and extra2 members, so the sysctl range is enforced.

The special values 0, 1 and INT_MAX are very often used as range
boundary, leading duplication of variables like zero=0, one=1,
int_max=INT_MAX in different source files:

    $ git grep -E '\.extra[12].*&(zero|one|int_max)' |wc -l
    248

Add a const int array containing the most commonly used values, some
macros to refer more easily to the correct array member, and use them
instead of creating a local one for every object file.

This is the bloat-o-meter output comparing the old and new binary
compiled with the default Fedora config:

    # scripts/bloat-o-meter -d vmlinux.o.old vmlinux.o
    add/remove: 2/2 grow/shrink: 0/2 up/down: 24/-188 (-164)
    Data                                         old     new   delta
    sysctl_vals                                    -      12     +12
    __kstrtab_sysctl_vals                          -      12     +12
    max                                           14      10      -4
    int_max                                       16       -     -16
    one                                           68       -     -68
    zero                                         128      28    -100
    Total: Before=20583249, After=20583085, chg -0.00%

[mcroce@redhat.com: tipc: remove two unused variables]
Link: http://lkml.kernel.org/r/20190530091952.4108-1-mcroce@redhat.com
[akpm@linux-foundation.org: fix net/ipv6/sysctl_net_ipv6.c]
[arnd@arndb.de: proc/sysctl: make firmware loader table conditional]
Link: http://lkml.kernel.org/r/20190617130014.1713870-1-arnd@arndb.de
[akpm@linux-foundation.org: fix fs/eventpoll.c]
Link: http://lkml.kernel.org/r/20190430180111.10688-1-mcroce@redhat.com
Signed-off-by: Matteo Croce <mcroce@redhat.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Aaron Tomlin <atomlin@redhat.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/s390/appldata/appldata_base.c b/arch/s390/appldata/appldata_base.c
index e4b58240ec5370791d1174132fbd164cff63c26b..aa738cad1338095a804f6f564c706cf23eb0905a 100644 (file)
--- a/arch/s390/appldata/appldata_base.c
+++ b/arch/s390/appldata/appldata_base.c
@@ -220,15 +220,13 @@ appldata_timer_handler(struct ctl_table *ctl, int write,
                           void __user *buffer, size_t *lenp, loff_t *ppos)
 {
        int timer_active = appldata_timer_active;
-       int zero = 0;
-       int one = 1;
        int rc;
        struct ctl_table ctl_entry = {
                .procname       = ctl->procname,
                .data           = &timer_active,
                .maxlen         = sizeof(int),
-               .extra1         = &zero,
-               .extra2         = &one,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE,
        };
 
        rc = proc_douintvec_minmax(&ctl_entry, write, buffer, lenp, ppos);
@@ -255,13 +253,12 @@ appldata_interval_handler(struct ctl_table *ctl, int write,
                           void __user *buffer, size_t *lenp, loff_t *ppos)
 {
        int interval = appldata_interval;
-       int one = 1;
        int rc;
        struct ctl_table ctl_entry = {
                .procname       = ctl->procname,
                .data           = &interval,
                .maxlen         = sizeof(int),
-               .extra1         = &one,
+               .extra1         = SYSCTL_ONE,
        };
 
        rc = proc_dointvec_minmax(&ctl_entry, write, buffer, lenp, ppos);
@@ -289,13 +286,11 @@ appldata_generic_handler(struct ctl_table *ctl, int write,
        struct list_head *lh;
        int rc, found;
        int active;
-       int zero = 0;
-       int one = 1;
        struct ctl_table ctl_entry = {
                .data           = &active,
                .maxlen         = sizeof(int),
-               .extra1         = &zero,
-               .extra2         = &one,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE,
        };
 
        found = 0;

diff --git a/arch/s390/kernel/topology.c b/arch/s390/kernel/topology.c
index 8964a3f60aadbb1fdc5d7c884acd44d565c72265..2db6fb405a9a508bade68470b52b2ccd0ed58236 100644 (file)
--- a/arch/s390/kernel/topology.c
+++ b/arch/s390/kernel/topology.c
@@ -587,15 +587,13 @@ static int topology_ctl_handler(struct ctl_table *ctl, int write,
 {
        int enabled = topology_is_enabled();
        int new_mode;
-       int zero = 0;
-       int one = 1;
        int rc;
        struct ctl_table ctl_entry = {
                .procname       = ctl->procname,
                .data           = &enabled,
                .maxlen         = sizeof(int),
-               .extra1         = &zero,
-               .extra2         = &one,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE,
        };
 
        rc = proc_douintvec_minmax(&ctl_entry, write, buffer, lenp, ppos);

diff --git a/arch/x86/entry/vdso/vdso32-setup.c b/arch/x86/entry/vdso/vdso32-setup.c
index 42d4c89f990ed1d752b24c641329671587313ba0..240626e7f55aa1e6ac2cd0b74138a4a97296cb7d 100644 (file)
--- a/arch/x86/entry/vdso/vdso32-setup.c
+++ b/arch/x86/entry/vdso/vdso32-setup.c
@@ -65,9 +65,6 @@ subsys_initcall(sysenter_setup);
 /* Register vsyscall32 into the ABI table */
 #include <linux/sysctl.h>
 
-static const int zero;
-static const int one = 1;
-
 static struct ctl_table abi_table2[] = {
        {
                .procname       = "vsyscall32",
@@ -75,8 +72,8 @@ static struct ctl_table abi_table2[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = (int *)&zero,
-               .extra2         = (int *)&one,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE,
        },
        {}
 };

diff --git a/arch/x86/kernel/itmt.c b/arch/x86/kernel/itmt.c
index 838cf8a32c49728f12e1a06d248909e23f82703a..1cb3ca9bba49b4fbff33f9f1926e572b9d69f991 100644 (file)
--- a/arch/x86/kernel/itmt.c
+++ b/arch/x86/kernel/itmt.c
@@ -65,8 +65,6 @@ static int sched_itmt_update_handler(struct ctl_table *table, int write,
        return ret;
 }
 
-static unsigned int zero;
-static unsigned int one = 1;
 static struct ctl_table itmt_kern_table[] = {
        {
                .procname       = "sched_itmt_enabled",
@@ -74,8 +72,8 @@ static struct ctl_table itmt_kern_table[] = {
                .maxlen         = sizeof(unsigned int),
                .mode           = 0644,
                .proc_handler   = sched_itmt_update_handler,
-               .extra1         = &zero,
-               .extra2         = &one,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE,
        },
        {}
 };

diff --git a/drivers/base/firmware_loader/fallback_table.c b/drivers/base/firmware_loader/fallback_table.c
index 776dd69cf5bead65906c90f878ebbabbeae58cad..ba9d30b28edc5a9d8a439f0a6a07610a5590cbb4 100644 (file)
--- a/drivers/base/firmware_loader/fallback_table.c
+++ b/drivers/base/firmware_loader/fallback_table.c
@@ -16,9 +16,6 @@
  * firmware fallback configuration table
  */
 
-static unsigned int zero;
-static unsigned int one = 1;
-
 struct firmware_fallback_config fw_fallback_config = {
        .force_sysfs_fallback = IS_ENABLED(CONFIG_FW_LOADER_USER_HELPER_FALLBACK),
        .loading_timeout = 60,
@@ -26,6 +23,7 @@ struct firmware_fallback_config fw_fallback_config = {
 };
 EXPORT_SYMBOL_GPL(fw_fallback_config);
 
+#ifdef CONFIG_SYSCTL
 struct ctl_table firmware_config_table[] = {
        {
                .procname       = "force_sysfs_fallback",
@@ -33,8 +31,8 @@ struct ctl_table firmware_config_table[] = {
                .maxlen         = sizeof(unsigned int),
                .mode           = 0644,
                .proc_handler   = proc_douintvec_minmax,
-               .extra1         = &zero,
-               .extra2         = &one,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE,
        },
        {
                .procname       = "ignore_sysfs_fallback",
@@ -42,9 +40,10 @@ struct ctl_table firmware_config_table[] = {
                .maxlen         = sizeof(unsigned int),
                .mode           = 0644,
                .proc_handler   = proc_douintvec_minmax,
-               .extra1         = &zero,
-               .extra2         = &one,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE,
        },
        { }
 };
 EXPORT_SYMBOL_GPL(firmware_config_table);
+#endif

diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c
index 3d8162d28730d1173b36662b26b90b17c8c66e8c..a700c5c3d1673516355bdbac0468adca9cfc664e 100644 (file)
--- a/drivers/gpu/drm/i915/i915_perf.c
+++ b/drivers/gpu/drm/i915/i915_perf.c
@@ -274,8 +274,6 @@
 #define POLL_PERIOD (NSEC_PER_SEC / POLL_FREQUENCY)
 
 /* for sysctl proc_dointvec_minmax of dev.i915.perf_stream_paranoid */
-static int zero;
-static int one = 1;
 static u32 i915_perf_stream_paranoid = true;
 
 /* The maximum exponent the hardware accepts is 63 (essentially it selects one
@@ -3366,8 +3364,8 @@ static struct ctl_table oa_table[] = {
         .maxlen = sizeof(i915_perf_stream_paranoid),
         .mode = 0644,
         .proc_handler = proc_dointvec_minmax,
-        .extra1 = &zero,
-        .extra2 = &one,
+        .extra1 = SYSCTL_ZERO,
+        .extra2 = SYSCTL_ONE,
         },
        {
         .procname = "oa_max_sample_rate",
@@ -3375,7 +3373,7 @@ static struct ctl_table oa_table[] = {
         .maxlen = sizeof(i915_oa_max_sample_rate),
         .mode = 0644,
         .proc_handler = proc_dointvec_minmax,
-        .extra1 = &zero,
+        .extra1 = SYSCTL_ZERO,
         .extra2 = &oa_sample_rate_hard_limit,
         },
        {}

diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
index 894da5abdc550461fe0f6d9031ac1def01c81731..ebd35fc3529064e7ee0522273b5d4a1302561926 100644 (file)
--- a/drivers/hv/vmbus_drv.c
+++ b/drivers/hv/vmbus_drv.c
@@ -1197,8 +1197,6 @@ static struct kmsg_dumper hv_kmsg_dumper = {
 };
 
 static struct ctl_table_header *hv_ctl_table_hdr;
-static int zero;
-static int one = 1;
 
 /*
  * sysctl option to allow the user to control whether kmsg data should be
@@ -1211,8 +1209,8 @@ static struct ctl_table hv_ctl_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
-               .extra2         = &one
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE
        },
        {}
 };

diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
index fde8d4073e74103acd33a5c84db79fa36857fa3b..4c49f53afa3ed3ca66c04ecd3f60a07d1dde0274 100644 (file)
--- a/drivers/tty/tty_ldisc.c
+++ b/drivers/tty/tty_ldisc.c
@@ -855,8 +855,6 @@ void tty_ldisc_deinit(struct tty_struct *tty)
        tty->ldisc = NULL;
 }
 
-static int zero;
-static int one = 1;
 static struct ctl_table tty_table[] = {
        {
                .procname       = "ldisc_autoload",
@@ -864,8 +862,8 @@ static struct ctl_table tty_table[] = {
                .maxlen         = sizeof(tty_ldisc_autoload),
                .mode           = 0644,
                .proc_handler   = proc_dointvec,
-               .extra1         = &zero,
-               .extra2         = &one,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE,
        },
        { }
 };

diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c
index d37dd5bb7a8fb73fb014466ff8a647ddf17fd8c0..37a36c6b9f937399dadd98f948d1b3c22e7cebfd 100644 (file)
--- a/drivers/xen/balloon.c
+++ b/drivers/xen/balloon.c
@@ -77,9 +77,6 @@ static int xen_hotplug_unpopulated;
 
 #ifdef CONFIG_XEN_BALLOON_MEMORY_HOTPLUG
 
-static int zero;
-static int one = 1;
-
 static struct ctl_table balloon_table[] = {
        {
                .procname       = "hotplug_unpopulated",
@@ -87,8 +84,8 @@ static struct ctl_table balloon_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
-               .extra2         = &one,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE,
        },
        { }
 };

diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index 0f9c073d78d5ed2fababaeea22054f6de2c2b833..d7f1f5011fac3997f55a36dd32409c5e8326a38e 100644 (file)
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -291,7 +291,7 @@ static LIST_HEAD(tfile_check_list);
 
 #include <linux/sysctl.h>
 
-static long zero;
+static long long_zero;
 static long long_max = LONG_MAX;
 
 struct ctl_table epoll_table[] = {
@@ -301,7 +301,7 @@ struct ctl_table epoll_table[] = {
                .maxlen         = sizeof(max_user_watches),
                .mode           = 0644,
                .proc_handler   = proc_doulongvec_minmax,
-               .extra1         = &zero,
+               .extra1         = &long_zero,
                .extra2         = &long_max,
        },
        { }

diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c
index cce8de32779fb4d125d347058b98278eb22ac175..0b815178126e51571550e893cc268b9141a156bd 100644 (file)
--- a/fs/notify/inotify/inotify_user.c
+++ b/fs/notify/inotify/inotify_user.c
@@ -45,8 +45,6 @@ struct kmem_cache *inotify_inode_mark_cachep __read_mostly;
 
 #include <linux/sysctl.h>
 
-static int zero;
-
 struct ctl_table inotify_table[] = {
        {
                .procname       = "max_user_instances",
@@ -54,7 +52,7 @@ struct ctl_table inotify_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
        },
        {
                .procname       = "max_user_watches",
@@ -62,7 +60,7 @@ struct ctl_table inotify_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
        },
        {
                .procname       = "max_queued_events",
@@ -70,7 +68,7 @@ struct ctl_table inotify_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero
+               .extra1         = SYSCTL_ZERO
        },
        { }
 };

diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
index 36ad1b0d625975383f48d469a0e278efb96c1dfb..d80989b6c3448db78c06e94c5e2323f261b7f4e4 100644 (file)
--- a/fs/proc/proc_sysctl.c
+++ b/fs/proc/proc_sysctl.c
@@ -22,6 +22,10 @@ static const struct inode_operations proc_sys_inode_operations;
 static const struct file_operations proc_sys_dir_file_operations;
 static const struct inode_operations proc_sys_dir_operations;
 
+/* shared constants to be used in various sysctls */
+const int sysctl_vals[] = { 0, 1, INT_MAX };
+EXPORT_SYMBOL(sysctl_vals);
+
 /* Support for permanently empty directories */
 
 struct ctl_table sysctl_mount_point[] = {

diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index aadd310769d080f1d45db14b2a72fc8ad36f1196..6df477329b76e57dbcb4d1cf9e78ce2e97c0bb69 100644 (file)
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -37,6 +37,13 @@ struct ctl_table_root;
 struct ctl_table_header;
 struct ctl_dir;
 
+/* Keep the same order as in fs/proc/proc_sysctl.c */
+#define SYSCTL_ZERO    ((void *)&sysctl_vals[0])
+#define SYSCTL_ONE     ((void *)&sysctl_vals[1])
+#define SYSCTL_INT_MAX ((void *)&sysctl_vals[2])
+
+extern const int sysctl_vals[];
+
 typedef int proc_handler (struct ctl_table *ctl, int write,
                          void __user *buffer, size_t *lenp, loff_t *ppos);
 

diff --git a/ipc/ipc_sysctl.c b/ipc/ipc_sysctl.c
index 2b14ce8ce73fa08f694e166c1ceb98ebeb946d44..affd66537e87550a3fb88c144957506f9140dcd1 100644 (file)
--- a/ipc/ipc_sysctl.c
+++ b/ipc/ipc_sysctl.c
@@ -113,9 +113,6 @@ static int proc_ipc_sem_dointvec(struct ctl_table *table, int write,
 #define proc_ipc_sem_dointvec     NULL
 #endif
 
-static int zero;
-static int one = 1;
-static int int_max = INT_MAX;
 int ipc_mni = IPCMNI;
 int ipc_mni_shift = IPCMNI_SHIFT;
 int ipc_min_cycle = RADIX_TREE_MAP_SIZE;
@@ -141,7 +138,7 @@ static struct ctl_table ipc_kern_table[] = {
                .maxlen         = sizeof(init_ipc_ns.shm_ctlmni),
                .mode           = 0644,
                .proc_handler   = proc_ipc_dointvec_minmax,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
                .extra2         = &ipc_mni,
        },
        {
@@ -150,8 +147,8 @@ static struct ctl_table ipc_kern_table[] = {
                .maxlen         = sizeof(init_ipc_ns.shm_rmid_forced),
                .mode           = 0644,
                .proc_handler   = proc_ipc_dointvec_minmax_orphans,
-               .extra1         = &zero,
-               .extra2         = &one,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE,
        },
        {
                .procname       = "msgmax",
@@ -159,8 +156,8 @@ static struct ctl_table ipc_kern_table[] = {
                .maxlen         = sizeof(init_ipc_ns.msg_ctlmax),
                .mode           = 0644,
                .proc_handler   = proc_ipc_dointvec_minmax,
-               .extra1         = &zero,
-               .extra2         = &int_max,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_INT_MAX,
        },
        {
                .procname       = "msgmni",
@@ -168,7 +165,7 @@ static struct ctl_table ipc_kern_table[] = {
                .maxlen         = sizeof(init_ipc_ns.msg_ctlmni),
                .mode           = 0644,
                .proc_handler   = proc_ipc_dointvec_minmax,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
                .extra2         = &ipc_mni,
        },
        {
@@ -177,8 +174,8 @@ static struct ctl_table ipc_kern_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_ipc_auto_msgmni,
-               .extra1         = &zero,
-               .extra2         = &one,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE,
        },
        {
                .procname       =  "msgmnb",
@@ -186,8 +183,8 @@ static struct ctl_table ipc_kern_table[] = {
                .maxlen         = sizeof(init_ipc_ns.msg_ctlmnb),
                .mode           = 0644,
                .proc_handler   = proc_ipc_dointvec_minmax,
-               .extra1         = &zero,
-               .extra2         = &int_max,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_INT_MAX,
        },
        {
                .procname       = "sem",
@@ -203,8 +200,8 @@ static struct ctl_table ipc_kern_table[] = {
                .maxlen         = sizeof(init_ipc_ns.ids[IPC_SEM_IDS].next_id),
                .mode           = 0644,
                .proc_handler   = proc_ipc_dointvec_minmax,
-               .extra1         = &zero,
-               .extra2         = &int_max,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_INT_MAX,
        },
        {
                .procname       = "msg_next_id",
@@ -212,8 +209,8 @@ static struct ctl_table ipc_kern_table[] = {
                .maxlen         = sizeof(init_ipc_ns.ids[IPC_MSG_IDS].next_id),
                .mode           = 0644,
                .proc_handler   = proc_ipc_dointvec_minmax,
-               .extra1         = &zero,
-               .extra2         = &int_max,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_INT_MAX,
        },
        {
                .procname       = "shm_next_id",
@@ -221,8 +218,8 @@ static struct ctl_table ipc_kern_table[] = {
                .maxlen         = sizeof(init_ipc_ns.ids[IPC_SHM_IDS].next_id),
                .mode           = 0644,
                .proc_handler   = proc_ipc_dointvec_minmax,
-               .extra1         = &zero,
-               .extra2         = &int_max,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_INT_MAX,
        },
 #endif
        {}

diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
index 6d726cef241cc82a252090ad70bde2c4af0cff94..a6a79f85c81a8972d1c9c3674aea9aeff691f192 100644 (file)
--- a/kernel/pid_namespace.c
+++ b/kernel/pid_namespace.c
@@ -291,14 +291,13 @@ static int pid_ns_ctl_handler(struct ctl_table *table, int write,
 }
 
 extern int pid_max;
-static int zero = 0;
 static struct ctl_table pid_ns_ctl_table[] = {
        {
                .procname = "ns_last_pid",
                .maxlen = sizeof(int),
                .mode = 0666, /* permissions are checked in the handler */
                .proc_handler = pid_ns_ctl_handler,
-               .extra1 = &zero,
+               .extra1 = SYSCTL_ZERO,
                .extra2 = &pid_max,
        },
        { }

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 43186ccfa139662417e5bbaba78915cb6b121b6c..078950d9605ba2f6c109c5837f52b1a6cc07d186 100644 (file)
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -125,9 +125,6 @@ static int sixty = 60;
 #endif
 
 static int __maybe_unused neg_one = -1;
-
-static int zero;
-static int __maybe_unused one = 1;
 static int __maybe_unused two = 2;
 static int __maybe_unused four = 4;
 static unsigned long zero_ul;
@@ -385,8 +382,8 @@ static struct ctl_table kern_table[] = {
                .maxlen         = sizeof(unsigned int),
                .mode           = 0644,
                .proc_handler   = sysctl_schedstats,
-               .extra1         = &zero,
-               .extra2         = &one,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE,
        },
 #endif /* CONFIG_SCHEDSTATS */
 #endif /* CONFIG_SMP */
@@ -418,7 +415,7 @@ static struct ctl_table kern_table[] = {
                .maxlen         = sizeof(unsigned int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &one,
+               .extra1         = SYSCTL_ONE,
        },
        {
                .procname       = "numa_balancing",
@@ -426,8 +423,8 @@ static struct ctl_table kern_table[] = {
                .maxlen         = sizeof(unsigned int),
                .mode           = 0644,
                .proc_handler   = sysctl_numa_balancing,
-               .extra1         = &zero,
-               .extra2         = &one,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE,
        },
 #endif /* CONFIG_NUMA_BALANCING */
 #endif /* CONFIG_SCHED_DEBUG */
@@ -475,8 +472,8 @@ static struct ctl_table kern_table[] = {
                .maxlen         = sizeof(unsigned int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
-               .extra2         = &one,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE,
        },
 #endif
 #ifdef CONFIG_CFS_BANDWIDTH
@@ -486,7 +483,7 @@ static struct ctl_table kern_table[] = {
                .maxlen         = sizeof(unsigned int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &one,
+               .extra1         = SYSCTL_ONE,
        },
 #endif
 #if defined(CONFIG_ENERGY_MODEL) && defined(CONFIG_CPU_FREQ_GOV_SCHEDUTIL)
@@ -496,8 +493,8 @@ static struct ctl_table kern_table[] = {
                .maxlen         = sizeof(unsigned int),
                .mode           = 0644,
                .proc_handler   = sched_energy_aware_handler,
-               .extra1         = &zero,
-               .extra2         = &one,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE,
        },
 #endif
 #ifdef CONFIG_PROVE_LOCKING
@@ -562,7 +559,7 @@ static struct ctl_table kern_table[] = {
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
                .extra1         = &neg_one,
-               .extra2         = &one,
+               .extra2         = SYSCTL_ONE,
        },
 #endif
 #ifdef CONFIG_LATENCYTOP
@@ -696,8 +693,8 @@ static struct ctl_table kern_table[] = {
                .mode           = 0644,
                /* only handle a transition from default "0" to "1" */
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &one,
-               .extra2         = &one,
+               .extra1         = SYSCTL_ONE,
+               .extra2         = SYSCTL_ONE,
        },
 #endif
 #ifdef CONFIG_MODULES
@@ -715,8 +712,8 @@ static struct ctl_table kern_table[] = {
                .mode           = 0644,
                /* only handle a transition from default "0" to "1" */
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &one,
-               .extra2         = &one,
+               .extra1         = SYSCTL_ONE,
+               .extra2         = SYSCTL_ONE,
        },
 #endif
 #ifdef CONFIG_UEVENT_HELPER
@@ -875,7 +872,7 @@ static struct ctl_table kern_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
                .extra2         = &ten_thousand,
        },
        {
@@ -891,8 +888,8 @@ static struct ctl_table kern_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax_sysadmin,
-               .extra1         = &zero,
-               .extra2         = &one,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE,
        },
        {
                .procname       = "kptr_restrict",
@@ -900,7 +897,7 @@ static struct ctl_table kern_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax_sysadmin,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
                .extra2         = &two,
        },
 #endif
@@ -925,8 +922,8 @@ static struct ctl_table kern_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_watchdog,
-               .extra1         = &zero,
-               .extra2         = &one,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE,
        },
        {
                .procname       = "watchdog_thresh",
@@ -934,7 +931,7 @@ static struct ctl_table kern_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_watchdog_thresh,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
                .extra2         = &sixty,
        },
        {
@@ -943,8 +940,8 @@ static struct ctl_table kern_table[] = {
                .maxlen         = sizeof(int),
                .mode           = NMI_WATCHDOG_SYSCTL_PERM,
                .proc_handler   = proc_nmi_watchdog,
-               .extra1         = &zero,
-               .extra2         = &one,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE,
        },
        {
                .procname       = "watchdog_cpumask",
@@ -960,8 +957,8 @@ static struct ctl_table kern_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_soft_watchdog,
-               .extra1         = &zero,
-               .extra2         = &one,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE,
        },
        {
                .procname       = "softlockup_panic",
@@ -969,8 +966,8 @@ static struct ctl_table kern_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
-               .extra2         = &one,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE,
        },
 #ifdef CONFIG_SMP
        {
@@ -979,8 +976,8 @@ static struct ctl_table kern_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
-               .extra2         = &one,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE,
        },
 #endif /* CONFIG_SMP */
 #endif
@@ -991,8 +988,8 @@ static struct ctl_table kern_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
-               .extra2         = &one,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE,
        },
 #ifdef CONFIG_SMP
        {
@@ -1001,8 +998,8 @@ static struct ctl_table kern_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
-               .extra2         = &one,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE,
        },
 #endif /* CONFIG_SMP */
 #endif
@@ -1115,8 +1112,8 @@ static struct ctl_table kern_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
-               .extra2         = &one,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE,
        },
        {
                .procname       = "hung_task_check_count",
@@ -1124,7 +1121,7 @@ static struct ctl_table kern_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
        },
        {
                .procname       = "hung_task_timeout_secs",
@@ -1201,7 +1198,7 @@ static struct ctl_table kern_table[] = {
                .maxlen         = sizeof(sysctl_perf_event_sample_rate),
                .mode           = 0644,
                .proc_handler   = perf_proc_update_handler,
-               .extra1         = &one,
+               .extra1         = SYSCTL_ONE,
        },
        {
                .procname       = "perf_cpu_time_max_percent",
@@ -1209,7 +1206,7 @@ static struct ctl_table kern_table[] = {
                .maxlen         = sizeof(sysctl_perf_cpu_time_max_percent),
                .mode           = 0644,
                .proc_handler   = perf_cpu_time_max_percent_handler,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
                .extra2         = &one_hundred,
        },
        {
@@ -1218,7 +1215,7 @@ static struct ctl_table kern_table[] = {
                .maxlen         = sizeof(sysctl_perf_event_max_stack),
                .mode           = 0644,
                .proc_handler   = perf_event_max_stack_handler,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
                .extra2         = &six_hundred_forty_kb,
        },
        {
@@ -1227,7 +1224,7 @@ static struct ctl_table kern_table[] = {
                .maxlen         = sizeof(sysctl_perf_event_max_contexts_per_stack),
                .mode           = 0644,
                .proc_handler   = perf_event_max_stack_handler,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
                .extra2         = &one_thousand,
        },
 #endif
@@ -1237,8 +1234,8 @@ static struct ctl_table kern_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
-               .extra2         = &one,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE,
        },
 #if defined(CONFIG_SMP) && defined(CONFIG_NO_HZ_COMMON)
        {
@@ -1247,8 +1244,8 @@ static struct ctl_table kern_table[] = {
                .maxlen         = sizeof(unsigned int),
                .mode           = 0644,
                .proc_handler   = timer_migration_handler,
-               .extra1         = &zero,
-               .extra2         = &one,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE,
        },
 #endif
 #ifdef CONFIG_BPF_SYSCALL
@@ -1259,8 +1256,8 @@ static struct ctl_table kern_table[] = {
                .mode           = 0644,
                /* only handle a transition from default "0" to "1" */
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &one,
-               .extra2         = &one,
+               .extra1         = SYSCTL_ONE,
+               .extra2         = SYSCTL_ONE,
        },
        {
                .procname       = "bpf_stats_enabled",
@@ -1277,8 +1274,8 @@ static struct ctl_table kern_table[] = {
                .maxlen         = sizeof(sysctl_panic_on_rcu_stall),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
-               .extra2         = &one,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE,
        },
 #endif
 #ifdef CONFIG_STACKLEAK_RUNTIME_DISABLE
@@ -1288,8 +1285,8 @@ static struct ctl_table kern_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0600,
                .proc_handler   = stack_erasing_sysctl,
-               .extra1         = &zero,
-               .extra2         = &one,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE,
        },
 #endif
        { }
@@ -1302,7 +1299,7 @@ static struct ctl_table vm_table[] = {
                .maxlen         = sizeof(sysctl_overcommit_memory),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
                .extra2         = &two,
        },
        {
@@ -1311,7 +1308,7 @@ static struct ctl_table vm_table[] = {
                .maxlen         = sizeof(sysctl_panic_on_oom),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
                .extra2         = &two,
        },
        {
@@ -1348,7 +1345,7 @@ static struct ctl_table vm_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
        },
        {
                .procname       = "dirty_background_ratio",
@@ -1356,7 +1353,7 @@ static struct ctl_table vm_table[] = {
                .maxlen         = sizeof(dirty_background_ratio),
                .mode           = 0644,
                .proc_handler   = dirty_background_ratio_handler,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
                .extra2         = &one_hundred,
        },
        {
@@ -1373,7 +1370,7 @@ static struct ctl_table vm_table[] = {
                .maxlen         = sizeof(vm_dirty_ratio),
                .mode           = 0644,
                .proc_handler   = dirty_ratio_handler,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
                .extra2         = &one_hundred,
        },
        {
@@ -1397,7 +1394,7 @@ static struct ctl_table vm_table[] = {
                .maxlen         = sizeof(dirty_expire_interval),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
        },
        {
                .procname       = "dirtytime_expire_seconds",
@@ -1405,7 +1402,7 @@ static struct ctl_table vm_table[] = {
                .maxlen         = sizeof(dirtytime_expire_interval),
                .mode           = 0644,
                .proc_handler   = dirtytime_interval_handler,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
        },
        {
                .procname       = "swappiness",
@@ -1413,7 +1410,7 @@ static struct ctl_table vm_table[] = {
                .maxlen         = sizeof(vm_swappiness),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
                .extra2         = &one_hundred,
        },
 #ifdef CONFIG_HUGETLB_PAGE
@@ -1438,8 +1435,8 @@ static struct ctl_table vm_table[] = {
                .maxlen                 = sizeof(int),
                .mode                   = 0644,
                .proc_handler   = sysctl_vm_numa_stat_handler,
-               .extra1                 = &zero,
-               .extra2                 = &one,
+               .extra1                 = SYSCTL_ZERO,
+               .extra2                 = SYSCTL_ONE,
        },
 #endif
         {
@@ -1470,7 +1467,7 @@ static struct ctl_table vm_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = drop_caches_sysctl_handler,
-               .extra1         = &one,
+               .extra1         = SYSCTL_ONE,
                .extra2         = &four,
        },
 #ifdef CONFIG_COMPACTION
@@ -1496,8 +1493,8 @@ static struct ctl_table vm_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec,
-               .extra1         = &zero,
-               .extra2         = &one,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE,
        },
 
 #endif /* CONFIG_COMPACTION */
@@ -1507,7 +1504,7 @@ static struct ctl_table vm_table[] = {
                .maxlen         = sizeof(min_free_kbytes),
                .mode           = 0644,
                .proc_handler   = min_free_kbytes_sysctl_handler,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
        },
        {
                .procname       = "watermark_boost_factor",
@@ -1515,7 +1512,7 @@ static struct ctl_table vm_table[] = {
                .maxlen         = sizeof(watermark_boost_factor),
                .mode           = 0644,
                .proc_handler   = watermark_boost_factor_sysctl_handler,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
        },
        {
                .procname       = "watermark_scale_factor",
@@ -1523,7 +1520,7 @@ static struct ctl_table vm_table[] = {
                .maxlen         = sizeof(watermark_scale_factor),
                .mode           = 0644,
                .proc_handler   = watermark_scale_factor_sysctl_handler,
-               .extra1         = &one,
+               .extra1         = SYSCTL_ONE,
                .extra2         = &one_thousand,
        },
        {
@@ -1532,7 +1529,7 @@ static struct ctl_table vm_table[] = {
                .maxlen         = sizeof(percpu_pagelist_fraction),
                .mode           = 0644,
                .proc_handler   = percpu_pagelist_fraction_sysctl_handler,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
        },
 #ifdef CONFIG_MMU
        {
@@ -1541,7 +1538,7 @@ static struct ctl_table vm_table[] = {
                .maxlen         = sizeof(sysctl_max_map_count),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
        },
 #else
        {
@@ -1550,7 +1547,7 @@ static struct ctl_table vm_table[] = {
                .maxlen         = sizeof(sysctl_nr_trim_pages),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
        },
 #endif
        {
@@ -1566,7 +1563,7 @@ static struct ctl_table vm_table[] = {
                .maxlen         = sizeof(block_dump),
                .mode           = 0644,
                .proc_handler   = proc_dointvec,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
        },
        {
                .procname       = "vfs_cache_pressure",
@@ -1574,7 +1571,7 @@ static struct ctl_table vm_table[] = {
                .maxlen         = sizeof(sysctl_vfs_cache_pressure),
                .mode           = 0644,
                .proc_handler   = proc_dointvec,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
        },
 #ifdef HAVE_ARCH_PICK_MMAP_LAYOUT
        {
@@ -1583,7 +1580,7 @@ static struct ctl_table vm_table[] = {
                .maxlen         = sizeof(sysctl_legacy_va_layout),
                .mode           = 0644,
                .proc_handler   = proc_dointvec,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
        },
 #endif
 #ifdef CONFIG_NUMA
@@ -1593,7 +1590,7 @@ static struct ctl_table vm_table[] = {
                .maxlen         = sizeof(node_reclaim_mode),
                .mode           = 0644,
                .proc_handler   = proc_dointvec,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
        },
        {
                .procname       = "min_unmapped_ratio",
@@ -1601,7 +1598,7 @@ static struct ctl_table vm_table[] = {
                .maxlen         = sizeof(sysctl_min_unmapped_ratio),
                .mode           = 0644,
                .proc_handler   = sysctl_min_unmapped_ratio_sysctl_handler,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
                .extra2         = &one_hundred,
        },
        {
@@ -1610,7 +1607,7 @@ static struct ctl_table vm_table[] = {
                .maxlen         = sizeof(sysctl_min_slab_ratio),
                .mode           = 0644,
                .proc_handler   = sysctl_min_slab_ratio_sysctl_handler,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
                .extra2         = &one_hundred,
        },
 #endif
@@ -1661,7 +1658,7 @@ static struct ctl_table vm_table[] = {
 #endif
                .mode           = 0644,
                .proc_handler   = proc_dointvec,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
        },
 #endif
 #ifdef CONFIG_HIGHMEM
@@ -1671,8 +1668,8 @@ static struct ctl_table vm_table[] = {
                .maxlen         = sizeof(vm_highmem_is_dirtyable),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
-               .extra2         = &one,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE,
        },
 #endif
 #ifdef CONFIG_MEMORY_FAILURE
@@ -1682,8 +1679,8 @@ static struct ctl_table vm_table[] = {
                .maxlen         = sizeof(sysctl_memory_failure_early_kill),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
-               .extra2         = &one,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE,
        },
        {
                .procname       = "memory_failure_recovery",
@@ -1691,8 +1688,8 @@ static struct ctl_table vm_table[] = {
                .maxlen         = sizeof(sysctl_memory_failure_recovery),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
-               .extra2         = &one,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE,
        },
 #endif
        {
@@ -1738,8 +1735,8 @@ static struct ctl_table vm_table[] = {
                .maxlen         = sizeof(sysctl_unprivileged_userfaultfd),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
-               .extra2         = &one,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE,
        },
 #endif
        { }
@@ -1875,8 +1872,8 @@ static struct ctl_table fs_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0600,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
-               .extra2         = &one,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE,
        },
        {
                .procname       = "protected_hardlinks",
@@ -1884,8 +1881,8 @@ static struct ctl_table fs_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0600,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
-               .extra2         = &one,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE,
        },
        {
                .procname       = "protected_fifos",
@@ -1893,7 +1890,7 @@ static struct ctl_table fs_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0600,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
                .extra2         = &two,
        },
        {
@@ -1902,7 +1899,7 @@ static struct ctl_table fs_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0600,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
                .extra2         = &two,
        },
        {
@@ -1911,7 +1908,7 @@ static struct ctl_table fs_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax_coredump,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
                .extra2         = &two,
        },
 #if defined(CONFIG_BINFMT_MISC) || defined(CONFIG_BINFMT_MISC_MODULE)
@@ -1948,7 +1945,7 @@ static struct ctl_table fs_table[] = {
                .maxlen         = sizeof(unsigned int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &one,
+               .extra1         = SYSCTL_ONE,
        },
        { }
 };
@@ -1970,8 +1967,8 @@ static struct ctl_table debug_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_kprobes_optimization_handler,
-               .extra1         = &zero,
-               .extra2         = &one,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE,
        },
 #endif
        { }
@@ -3395,8 +3392,8 @@ int proc_do_static_key(struct ctl_table *table, int write,
                .data   = &val,
                .maxlen = sizeof(val),
                .mode   = table->mode,
-               .extra1 = &zero,
-               .extra2 = &one,
+               .extra1 = SYSCTL_ZERO,
+               .extra2 = SYSCTL_ONE,
        };
 
        if (write && !capable(CAP_SYS_ADMIN))

diff --git a/kernel/ucount.c b/kernel/ucount.c
index feb128c7b5d96954068f1ca9bb37cf5c96df4d79..a53cc2b4179c089c2f2e8e80de74741b9b3c7c26 100644 (file)
--- a/kernel/ucount.c
+++ b/kernel/ucount.c
@@ -52,16 +52,14 @@ static struct ctl_table_root set_root = {
        .permissions = set_permissions,
 };
 
-static int zero = 0;
-static int int_max = INT_MAX;
 #define UCOUNT_ENTRY(name)                             \
        {                                               \
                .procname       = name,                 \
                .maxlen         = sizeof(int),          \
                .mode           = 0644,                 \
                .proc_handler   = proc_dointvec_minmax, \
-               .extra1         = &zero,                \
-               .extra2         = &int_max,             \
+               .extra1         = SYSCTL_ZERO,          \
+               .extra2         = SYSCTL_INT_MAX,       \
        }
 static struct ctl_table user_table[] = {
        UCOUNT_ENTRY("max_user_namespaces"),

diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index 742cea4ce72e4ecc308aafa18fa474476e2a2004..26da97359d5b55b0f3c4d018420c3944dbdf4908 100644 (file)
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -3374,8 +3374,6 @@ void neigh_app_ns(struct neighbour *n)
 EXPORT_SYMBOL(neigh_app_ns);
 
 #ifdef CONFIG_SYSCTL
-static int zero;
-static int int_max = INT_MAX;
 static int unres_qlen_max = INT_MAX / SKB_TRUESIZE(ETH_FRAME_LEN);
 
 static int proc_unres_qlen(struct ctl_table *ctl, int write,
@@ -3384,7 +3382,7 @@ static int proc_unres_qlen(struct ctl_table *ctl, int write,
        int size, ret;
        struct ctl_table tmp = *ctl;
 
-       tmp.extra1 = &zero;
+       tmp.extra1 = SYSCTL_ZERO;
        tmp.extra2 = &unres_qlen_max;
        tmp.data = &size;
 
@@ -3449,8 +3447,8 @@ static int neigh_proc_dointvec_zero_intmax(struct ctl_table *ctl, int write,
        struct ctl_table tmp = *ctl;
        int ret;
 
-       tmp.extra1 = &zero;
-       tmp.extra2 = &int_max;
+       tmp.extra1 = SYSCTL_ZERO;
+       tmp.extra2 = SYSCTL_INT_MAX;
 
        ret = proc_dointvec_minmax(&tmp, write, buffer, lenp, ppos);
        neigh_proc_update(ctl, write);
@@ -3595,24 +3593,24 @@ static struct neigh_sysctl_table {
                        .procname       = "gc_thresh1",
                        .maxlen         = sizeof(int),
                        .mode           = 0644,
-                       .extra1         = &zero,
-                       .extra2         = &int_max,
+                       .extra1         = SYSCTL_ZERO,
+                       .extra2         = SYSCTL_INT_MAX,
                        .proc_handler   = proc_dointvec_minmax,
                },
                [NEIGH_VAR_GC_THRESH2] = {
                        .procname       = "gc_thresh2",
                        .maxlen         = sizeof(int),
                        .mode           = 0644,
-                       .extra1         = &zero,
-                       .extra2         = &int_max,
+                       .extra1         = SYSCTL_ZERO,
+                       .extra2         = SYSCTL_INT_MAX,
                        .proc_handler   = proc_dointvec_minmax,
                },
                [NEIGH_VAR_GC_THRESH3] = {
                        .procname       = "gc_thresh3",
                        .maxlen         = sizeof(int),
                        .mode           = 0644,
-                       .extra1         = &zero,
-                       .extra2         = &int_max,
+                       .extra1         = SYSCTL_ZERO,
+                       .extra2         = SYSCTL_INT_MAX,
                        .proc_handler   = proc_dointvec_minmax,
                },
                {},

diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
index f9204719aeeeb4700582d03fda244f2f8961f8a7..8da5b3a54dac40c3eb939408486b6e1036306747 100644 (file)
--- a/net/core/sysctl_net_core.c
+++ b/net/core/sysctl_net_core.c
@@ -22,8 +22,6 @@
 #include <net/busy_poll.h>
 #include <net/pkt_sched.h>
 
-static int zero = 0;
-static int one = 1;
 static int two __maybe_unused = 2;
 static int min_sndbuf = SOCK_MIN_SNDBUF;
 static int min_rcvbuf = SOCK_MIN_RCVBUF;
@@ -390,10 +388,10 @@ static struct ctl_table net_core_table[] = {
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax_bpf_enable,
 # ifdef CONFIG_BPF_JIT_ALWAYS_ON
-               .extra1         = &one,
-               .extra2         = &one,
+               .extra1         = SYSCTL_ONE,
+               .extra2         = SYSCTL_ONE,
 # else
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
                .extra2         = &two,
 # endif
        },
@@ -404,7 +402,7 @@ static struct ctl_table net_core_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0600,
                .proc_handler   = proc_dointvec_minmax_bpf_restricted,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
                .extra2         = &two,
        },
        {
@@ -413,8 +411,8 @@ static struct ctl_table net_core_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0600,
                .proc_handler   = proc_dointvec_minmax_bpf_restricted,
-               .extra1         = &zero,
-               .extra2         = &one,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE,
        },
 # endif
        {
@@ -461,8 +459,8 @@ static struct ctl_table net_core_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
-               .extra2         = &one
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE
        },
 #ifdef CONFIG_RPS
        {
@@ -493,7 +491,7 @@ static struct ctl_table net_core_table[] = {
                .maxlen         = sizeof(unsigned int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
        },
        {
                .procname       = "busy_read",
@@ -501,7 +499,7 @@ static struct ctl_table net_core_table[] = {
                .maxlen         = sizeof(unsigned int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
        },
 #endif
 #ifdef CONFIG_NET_SCHED
@@ -533,7 +531,7 @@ static struct ctl_table net_core_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &one,
+               .extra1         = SYSCTL_ONE,
                .extra2         = &max_skb_frags,
        },
        {
@@ -542,7 +540,7 @@ static struct ctl_table net_core_table[] = {
                .maxlen         = sizeof(unsigned int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
        },
        {
                .procname       = "fb_tunnels_only_for_init_net",
@@ -550,8 +548,8 @@ static struct ctl_table net_core_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
-               .extra2         = &one,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE,
        },
        {
                .procname       = "devconf_inherit_init_net",
@@ -559,7 +557,7 @@ static struct ctl_table net_core_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
                .extra2         = &two,
        },
        {
@@ -578,7 +576,7 @@ static struct ctl_table netns_core_table[] = {
                .data           = &init_net.core.sysctl_somaxconn,
                .maxlen         = sizeof(int),
                .mode           = 0644,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
                .proc_handler   = proc_dointvec_minmax
        },
        { }

diff --git a/net/dccp/sysctl.c b/net/dccp/sysctl.c
index b59040f268a9988e2b882b8062dd68b195279898..ee8d4f5afa72262c96b220bfdd5ef954d11daa38 100644 (file)
--- a/net/dccp/sysctl.c
+++ b/net/dccp/sysctl.c
@@ -16,9 +16,7 @@
 #endif
 
 /* Boundary values */
-static int             zero     = 0,
-                       one      = 1,
-                       u8_max   = 0xFF;
+static int             u8_max   = 0xFF;
 static unsigned long   seqw_min = DCCPF_SEQ_WMIN,
                        seqw_max = 0xFFFFFFFF;          /* maximum on 32 bit */
 
@@ -38,7 +36,7 @@ static struct ctl_table dccp_default_table[] = {
                .maxlen         = sizeof(sysctl_dccp_rx_ccid),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
                .extra2         = &u8_max,              /* RFC 4340, 10. */
        },
        {
@@ -47,7 +45,7 @@ static struct ctl_table dccp_default_table[] = {
                .maxlen         = sizeof(sysctl_dccp_tx_ccid),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
                .extra2         = &u8_max,              /* RFC 4340, 10. */
        },
        {
@@ -56,7 +54,7 @@ static struct ctl_table dccp_default_table[] = {
                .maxlen         = sizeof(sysctl_dccp_request_retries),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &one,
+               .extra1         = SYSCTL_ONE,
                .extra2         = &u8_max,
        },
        {
@@ -65,7 +63,7 @@ static struct ctl_table dccp_default_table[] = {
                .maxlen         = sizeof(sysctl_dccp_retries1),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
                .extra2         = &u8_max,
        },
        {
@@ -74,7 +72,7 @@ static struct ctl_table dccp_default_table[] = {
                .maxlen         = sizeof(sysctl_dccp_retries2),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
                .extra2         = &u8_max,
        },
        {
@@ -83,7 +81,7 @@ static struct ctl_table dccp_default_table[] = {
                .maxlen         = sizeof(sysctl_dccp_tx_qlen),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
        },
        {
                .procname       = "sync_ratelimit",

diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
index 7d66306b5f39719ac432178948ceac256018d52a..0b980e84192738362e19ce3a9e921cff23a1449b 100644 (file)
--- a/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
@@ -28,8 +28,6 @@
 #include <net/protocol.h>
 #include <net/netevent.h>
 
-static int zero;
-static int one = 1;
 static int two = 2;
 static int four = 4;
 static int thousand = 1000;
@@ -576,7 +574,7 @@ static struct ctl_table ipv4_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
        },
        {
                .procname       = "icmp_msgs_burst",
@@ -584,7 +582,7 @@ static struct ctl_table ipv4_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
        },
        {
                .procname       = "udp_mem",
@@ -674,8 +672,8 @@ static struct ctl_table ipv4_net_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
-               .extra2         = &one,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE,
        },
 #endif
        {
@@ -763,8 +761,8 @@ static struct ctl_table ipv4_net_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = ipv4_fwd_update_priority,
-               .extra1         = &zero,
-               .extra2         = &one,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE,
        },
        {
                .procname       = "ip_nonlocal_bind",
@@ -794,8 +792,8 @@ static struct ctl_table ipv4_net_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
-               .extra2         = &one,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE,
        },
 #endif
        {
@@ -864,7 +862,7 @@ static struct ctl_table ipv4_net_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &one
+               .extra1         = SYSCTL_ONE
        },
 #endif
        {
@@ -969,7 +967,7 @@ static struct ctl_table ipv4_net_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
                .extra2         = &two,
        },
        {
@@ -1011,7 +1009,7 @@ static struct ctl_table ipv4_net_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_tfo_blackhole_detect_timeout,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
        },
 #ifdef CONFIG_IP_ROUTE_MULTIPATH
        {
@@ -1020,8 +1018,8 @@ static struct ctl_table ipv4_net_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
-               .extra2         = &one,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE,
        },
        {
                .procname       = "fib_multipath_hash_policy",
@@ -1029,8 +1027,8 @@ static struct ctl_table ipv4_net_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_fib_multipath_hash_policy,
-               .extra1         = &zero,
-               .extra2         = &two,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE,
        },
 #endif
        {
@@ -1047,8 +1045,8 @@ static struct ctl_table ipv4_net_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
-               .extra2         = &one,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE,
        },
 #endif
        {
@@ -1078,7 +1076,7 @@ static struct ctl_table ipv4_net_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
                .extra2         = &four,
        },
        {
@@ -1222,7 +1220,7 @@ static struct ctl_table ipv4_net_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &one,
+               .extra1         = SYSCTL_ONE,
                .extra2         = &gso_max_segs,
        },
        {
@@ -1231,7 +1229,7 @@ static struct ctl_table ipv4_net_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
                .extra2         = &one_day_secs
        },
        {
@@ -1240,8 +1238,8 @@ static struct ctl_table ipv4_net_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
-               .extra2         = &one,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE,
        },
        {
                .procname       = "tcp_invalid_ratelimit",
@@ -1256,7 +1254,7 @@ static struct ctl_table ipv4_net_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
                .extra2         = &thousand,
        },
        {
@@ -1265,7 +1263,7 @@ static struct ctl_table ipv4_net_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
                .extra2         = &thousand,
        },
        {
@@ -1274,7 +1272,7 @@ static struct ctl_table ipv4_net_table[] = {
                .maxlen         = sizeof(init_net.ipv4.sysctl_tcp_wmem),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &one,
+               .extra1         = SYSCTL_ONE,
        },
        {
                .procname       = "tcp_rmem",
@@ -1282,7 +1280,7 @@ static struct ctl_table ipv4_net_table[] = {
                .maxlen         = sizeof(init_net.ipv4.sysctl_tcp_rmem),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &one,
+               .extra1         = SYSCTL_ONE,
        },
        {
                .procname       = "tcp_comp_sack_delay_ns",
@@ -1297,7 +1295,7 @@ static struct ctl_table ipv4_net_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
                .extra2         = &comp_sack_nr_max,
        },
        {
@@ -1306,7 +1304,7 @@ static struct ctl_table ipv4_net_table[] = {
                .maxlen         = sizeof(init_net.ipv4.sysctl_udp_rmem_min),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &one
+               .extra1         = SYSCTL_ONE
        },
        {
                .procname       = "udp_wmem_min",
@@ -1314,7 +1312,7 @@ static struct ctl_table ipv4_net_table[] = {
                .maxlen         = sizeof(init_net.ipv4.sysctl_udp_wmem_min),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &one
+               .extra1         = SYSCTL_ONE
        },
        { }
 };

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 521e3203e83a473d3234151e61c97a81baa02da3..dc73888c7859a2d0d499fabd14aa8b71e12b0e77 100644 (file)
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -6432,8 +6432,6 @@ int addrconf_sysctl_disable_policy(struct ctl_table *ctl, int write,
 }
 
 static int minus_one = -1;
-static const int zero = 0;
-static const int one = 1;
 static const int two_five_five = 255;
 
 static const struct ctl_table addrconf_sysctl[] = {
@@ -6450,7 +6448,7 @@ static const struct ctl_table addrconf_sysctl[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = (void *)&one,
+               .extra1         = (void *)SYSCTL_ONE,
                .extra2         = (void *)&two_five_five,
        },
        {
@@ -6809,7 +6807,7 @@ static const struct ctl_table addrconf_sysctl[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = (void *)&zero,
+               .extra1         = (void *)SYSCTL_ZERO,
                .extra2         = (void *)&two_five_five,
        },
        {

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 4d2e6b31a8d66877c66f8075828ae9f3d1b439ca..8b0c33fb19a2667174f58f0f92ffbefe12b42932 100644 (file)
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -6031,9 +6031,6 @@ int ipv6_sysctl_rtcache_flush(struct ctl_table *ctl, int write,
        return 0;
 }
 
-static int zero;
-static int one = 1;
-
 static struct ctl_table ipv6_route_table_template[] = {
        {
                .procname       =       "flush",
@@ -6111,8 +6108,8 @@ static struct ctl_table ipv6_route_table_template[] = {
                .maxlen         =       sizeof(int),
                .mode           =       0644,
                .proc_handler   =       proc_dointvec_minmax,
-               .extra1         =       &zero,
-               .extra2         =       &one,
+               .extra1         =       SYSCTL_ZERO,
+               .extra2         =       SYSCTL_ONE,
        },
        { }
 };

diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c
index dc4c91e0bfb8efcc9599b7505f526d443527e62d..ec8fcfc60a27ba2a238cf05ecae292e2db4daedc 100644 (file)
--- a/net/ipv6/sysctl_net_ipv6.c
+++ b/net/ipv6/sysctl_net_ipv6.c
@@ -21,8 +21,6 @@
 #include <net/calipso.h>
 #endif
 
-static int zero;
-static int one = 1;
 static int flowlabel_reflect_max = 0x7;
 static int auto_flowlabels_min;
 static int auto_flowlabels_max = IP6_AUTO_FLOW_LABEL_MAX;
@@ -115,7 +113,7 @@ static struct ctl_table ipv6_table_template[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
                .extra2         = &flowlabel_reflect_max,
        },
        {
@@ -152,8 +150,8 @@ static struct ctl_table ipv6_table_template[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_rt6_multipath_hash_policy,
-               .extra1         = &zero,
-               .extra2         = &one,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE,
        },
        {
                .procname       = "seg6_flowlabel",
@@ -179,7 +177,7 @@ static struct ctl_table ipv6_rotable[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &one
+               .extra1         = SYSCTL_ONE
        },
 #ifdef CONFIG_NETLABEL
        {

diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c
index 198ec4fe4148b897a58ec74aa04ec6dfd9b3078e..c312741df2ce9edb84ab5e60697d98bf0286d500 100644 (file)
--- a/net/mpls/af_mpls.c
+++ b/net/mpls/af_mpls.c
@@ -37,8 +37,6 @@
 
 #define MPLS_NEIGH_TABLE_UNSPEC (NEIGH_LINK_TABLE + 1)
 
-static int zero = 0;
-static int one = 1;
 static int label_limit = (1 << 20) - 1;
 static int ttl_max = 255;
 
@@ -2607,7 +2605,7 @@ static int mpls_platform_labels(struct ctl_table *table, int write,
                .data           = &platform_labels,
                .maxlen         = sizeof(int),
                .mode           = table->mode,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
                .extra2         = &label_limit,
        };
 
@@ -2636,8 +2634,8 @@ static const struct ctl_table mpls_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
-               .extra2         = &one,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE,
        },
        {
                .procname       = "default_ttl",
@@ -2645,7 +2643,7 @@ static const struct ctl_table mpls_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &one,
+               .extra1         = SYSCTL_ONE,
                .extra2         = &ttl_max,
        },
        { }

diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
index 07e0967bf1296671657bda8f77e311cb28d3cb99..060565e7d227a6b904941301aea2ba0c507d893b 100644 (file)
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@ -1726,7 +1726,6 @@ static int ip_vs_zero_all(struct netns_ipvs *ipvs)
 
 #ifdef CONFIG_SYSCTL
 
-static int zero;
 static int three = 3;
 
 static int
@@ -1935,7 +1934,7 @@ static struct ctl_table vs_vars[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
                .extra2         = &three,
        },
        {

diff --git a/net/rxrpc/sysctl.c b/net/rxrpc/sysctl.c
index 1e3fa67d91aa8ee05b25f1e29a185329670a8c76..2bbb38161851a48965272ef2984e23f76b4cb308 100644 (file)
--- a/net/rxrpc/sysctl.c
+++ b/net/rxrpc/sysctl.c
@@ -11,7 +11,6 @@
 #include "ar-internal.h"
 
 static struct ctl_table_header *rxrpc_sysctl_reg_table;
-static const unsigned int one = 1;
 static const unsigned int four = 4;
 static const unsigned int thirtytwo = 32;
 static const unsigned int n_65535 = 65535;
@@ -97,7 +96,7 @@ static struct ctl_table rxrpc_sysctl_table[] = {
                .maxlen         = sizeof(unsigned int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = (void *)&one,
+               .extra1         = (void *)SYSCTL_ONE,
                .extra2         = (void *)&rxrpc_max_client_connections,
        },
        {
@@ -115,7 +114,7 @@ static struct ctl_table rxrpc_sysctl_table[] = {
                .maxlen         = sizeof(unsigned int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = (void *)&one,
+               .extra1         = (void *)SYSCTL_ONE,
                .extra2         = (void *)&n_max_acks,
        },
        {
@@ -124,7 +123,7 @@ static struct ctl_table rxrpc_sysctl_table[] = {
                .maxlen         = sizeof(unsigned int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = (void *)&one,
+               .extra1         = (void *)SYSCTL_ONE,
                .extra2         = (void *)&n_65535,
        },
        {
@@ -133,7 +132,7 @@ static struct ctl_table rxrpc_sysctl_table[] = {
                .maxlen         = sizeof(unsigned int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = (void *)&one,
+               .extra1         = (void *)SYSCTL_ONE,
                .extra2         = (void *)&four,
        },
 

diff --git a/net/sctp/sysctl.c b/net/sctp/sysctl.c
index 9a19147902f175aeb8963d7a93b8a5c47d68524e..1250751bca1bc2283307aaf668a788013d7149b4 100644 (file)
--- a/net/sctp/sysctl.c
+++ b/net/sctp/sysctl.c
@@ -25,10 +25,7 @@
 #include <net/sctp/sctp.h>
 #include <linux/sysctl.h>
 
-static int zero = 0;
-static int one = 1;
 static int timer_max = 86400000; /* ms in one day */
-static int int_max = INT_MAX;
 static int sack_timer_min = 1;
 static int sack_timer_max = 500;
 static int addr_scope_max = SCTP_SCOPE_POLICY_MAX;
@@ -92,7 +89,7 @@ static struct ctl_table sctp_net_table[] = {
                .maxlen         = sizeof(unsigned int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &one,
+               .extra1         = SYSCTL_ONE,
                .extra2         = &timer_max
        },
        {
@@ -101,7 +98,7 @@ static struct ctl_table sctp_net_table[] = {
                .maxlen         = sizeof(unsigned int),
                .mode           = 0644,
                .proc_handler   = proc_sctp_do_rto_min,
-               .extra1         = &one,
+               .extra1         = SYSCTL_ONE,
                .extra2         = &init_net.sctp.rto_max
        },
        {
@@ -137,8 +134,8 @@ static struct ctl_table sctp_net_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
-               .extra2         = &int_max
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_INT_MAX,
        },
        {
                .procname       = "cookie_preserve_enable",
@@ -160,7 +157,7 @@ static struct ctl_table sctp_net_table[] = {
                .maxlen         = sizeof(unsigned int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &one,
+               .extra1         = SYSCTL_ONE,
                .extra2         = &timer_max
        },
        {
@@ -178,7 +175,7 @@ static struct ctl_table sctp_net_table[] = {
                .maxlen         = sizeof(unsigned int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &one,
+               .extra1         = SYSCTL_ONE,
                .extra2         = &timer_max
        },
        {
@@ -187,8 +184,8 @@ static struct ctl_table sctp_net_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &one,
-               .extra2         = &int_max
+               .extra1         = SYSCTL_ONE,
+               .extra2         = SYSCTL_INT_MAX,
        },
        {
                .procname       = "path_max_retrans",
@@ -196,8 +193,8 @@ static struct ctl_table sctp_net_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &one,
-               .extra2         = &int_max
+               .extra1         = SYSCTL_ONE,
+               .extra2         = SYSCTL_INT_MAX,
        },
        {
                .procname       = "max_init_retransmits",
@@ -205,8 +202,8 @@ static struct ctl_table sctp_net_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &one,
-               .extra2         = &int_max
+               .extra1         = SYSCTL_ONE,
+               .extra2         = SYSCTL_INT_MAX,
        },
        {
                .procname       = "pf_retrans",
@@ -214,8 +211,8 @@ static struct ctl_table sctp_net_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
-               .extra2         = &int_max
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_INT_MAX,
        },
        {
                .procname       = "sndbuf_policy",
@@ -286,7 +283,7 @@ static struct ctl_table sctp_net_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
                .extra2         = &addr_scope_max,
        },
        {
@@ -295,7 +292,7 @@ static struct ctl_table sctp_net_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = &proc_dointvec_minmax,
-               .extra1         = &one,
+               .extra1         = SYSCTL_ONE,
                .extra2         = &rwnd_scale_max,
        },
        {

diff --git a/net/sunrpc/xprtrdma/transport.c b/net/sunrpc/xprtrdma/transport.c
index 1f73a6a7e43c248d795f162239891c5ad4549ebb..ffb1684c4573806d23a84f659e22f9be5cf12119 100644 (file)
--- a/net/sunrpc/xprtrdma/transport.c
+++ b/net/sunrpc/xprtrdma/transport.c
@@ -80,7 +80,6 @@ static unsigned int min_slot_table_size = RPCRDMA_MIN_SLOT_TABLE;
 static unsigned int max_slot_table_size = RPCRDMA_MAX_SLOT_TABLE;
 static unsigned int min_inline_size = RPCRDMA_MIN_INLINE;
 static unsigned int max_inline_size = RPCRDMA_MAX_INLINE;
-static unsigned int zero;
 static unsigned int max_padding = PAGE_SIZE;
 static unsigned int min_memreg = RPCRDMA_BOUNCEBUFFERS;
 static unsigned int max_memreg = RPCRDMA_LAST - 1;
@@ -122,7 +121,7 @@ static struct ctl_table xr_tunables_table[] = {
                .maxlen         = sizeof(unsigned int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
                .extra2         = &max_padding,
        },
        {

diff --git a/net/tipc/sysctl.c b/net/tipc/sysctl.c
index 9df82a573aa7768f583999e740022ce00295bbd4..6159d327db76a577607928142c8e881e3d1cac30 100644 (file)
--- a/net/tipc/sysctl.c
+++ b/net/tipc/sysctl.c
@@ -38,8 +38,6 @@
 
 #include <linux/sysctl.h>
 
-static int zero;
-static int one = 1;
 static struct ctl_table_header *tipc_ctl_hdr;
 
 static struct ctl_table tipc_table[] = {
@@ -49,7 +47,7 @@ static struct ctl_table tipc_table[] = {
                .maxlen         = sizeof(sysctl_tipc_rmem),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &one,
+               .extra1         = SYSCTL_ONE,
        },
        {
                .procname       = "named_timeout",
@@ -57,7 +55,7 @@ static struct ctl_table tipc_table[] = {
                .maxlen         = sizeof(sysctl_tipc_named_timeout),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
        },
        {
                .procname       = "sk_filter",

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
        { }

diff --git a/security/loadpin/loadpin.c b/security/loadpin/loadpin.c
index 81519c804888c613fb86afc164f67238fcd333ba..ee5cb944f4ad1bdd70c2a91001c53bc72ba1b2e1 100644 (file)
--- a/security/loadpin/loadpin.c
+++ b/security/loadpin/loadpin.c
@@ -43,8 +43,6 @@ static struct super_block *pinned_root;
 static DEFINE_SPINLOCK(pinned_root_spinlock);
 
 #ifdef CONFIG_SYSCTL
-static int zero;
-static int one = 1;
 
 static struct ctl_path loadpin_sysctl_path[] = {
        { .procname = "kernel", },
@@ -59,8 +57,8 @@ static struct ctl_table loadpin_sysctl_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
-               .extra2         = &one,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE,
        },
        { }
 };

diff --git a/security/yama/yama_lsm.c b/security/yama/yama_lsm.c
index 01c6239c4493a53a0b5584a8e9ad05574174dc33..94dc346370b106a73a78da6d3acfbcb82c297541 100644 (file)
--- a/security/yama/yama_lsm.c
+++ b/security/yama/yama_lsm.c
@@ -445,7 +445,6 @@ static int yama_dointvec_minmax(struct ctl_table *table, int write,
        return proc_dointvec_minmax(&table_copy, write, buffer, lenp, ppos);
 }
 
-static int zero;
 static int max_scope = YAMA_SCOPE_NO_ATTACH;
 
 static struct ctl_path yama_sysctl_path[] = {
@@ -461,7 +460,7 @@ static struct ctl_table yama_sysctl_table[] = {
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = yama_dointvec_minmax,
-               .extra1         = &zero,
+               .extra1         = SYSCTL_ZERO,
                .extra2         = &max_scope,
        },
        { }