From: Wen Yang Replace security bound pointers with numeric limits. Suggested-by: Joel Granados Signed-off-by: Wen Yang --- security/keys/sysctl.c | 25 +++++++++++++------------ security/loadpin/loadpin.c | 4 ++-- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/security/keys/sysctl.c b/security/keys/sysctl.c index cde08c478f32..f0017dbff963 100644 --- a/security/keys/sysctl.c +++ b/security/keys/sysctl.c @@ -6,6 +6,7 @@ */ #include +#include #include #include "internal.h" @@ -16,8 +17,8 @@ static const struct ctl_table key_sysctls[] = { .maxlen = sizeof(unsigned), .mode = 0644, .proc_handler = proc_dointvec_minmax, - .extra1 = (void *) SYSCTL_ONE, - .extra2 = (void *) SYSCTL_INT_MAX, + .min = 1, + .max = INT_MAX, }, { .procname = "maxbytes", @@ -25,8 +26,8 @@ static const struct ctl_table key_sysctls[] = { .maxlen = sizeof(unsigned), .mode = 0644, .proc_handler = proc_dointvec_minmax, - .extra1 = (void *) SYSCTL_ONE, - .extra2 = (void *) SYSCTL_INT_MAX, + .min = 1, + .max = INT_MAX, }, { .procname = "root_maxkeys", @@ -34,8 +35,8 @@ static const struct ctl_table key_sysctls[] = { .maxlen = sizeof(unsigned), .mode = 0644, .proc_handler = proc_dointvec_minmax, - .extra1 = (void *) SYSCTL_ONE, - .extra2 = (void *) SYSCTL_INT_MAX, + .min = 1, + .max = INT_MAX, }, { .procname = "root_maxbytes", @@ -43,8 +44,8 @@ static const struct ctl_table key_sysctls[] = { .maxlen = sizeof(unsigned), .mode = 0644, .proc_handler = proc_dointvec_minmax, - .extra1 = (void *) SYSCTL_ONE, - .extra2 = (void *) SYSCTL_INT_MAX, + .min = 1, + .max = INT_MAX, }, { .procname = "gc_delay", @@ -52,8 +53,8 @@ static const struct ctl_table key_sysctls[] = { .maxlen = sizeof(unsigned), .mode = 0644, .proc_handler = proc_dointvec_minmax, - .extra1 = (void *) SYSCTL_ZERO, - .extra2 = (void *) SYSCTL_INT_MAX, + .min = 0, + .max = INT_MAX, }, #ifdef CONFIG_PERSISTENT_KEYRINGS { @@ -62,8 +63,8 @@ static const struct ctl_table key_sysctls[] = { .maxlen = sizeof(unsigned), .mode = 0644, .proc_handler = proc_dointvec_minmax, - .extra1 = (void *) SYSCTL_ZERO, - .extra2 = (void *) SYSCTL_INT_MAX, + .min = 0, + .max = INT_MAX, }, #endif }; diff --git a/security/loadpin/loadpin.c b/security/loadpin/loadpin.c index f71861f98e1a..7993ab17eacf 100644 --- a/security/loadpin/loadpin.c +++ b/security/loadpin/loadpin.c @@ -72,8 +72,8 @@ static const struct ctl_table loadpin_sysctl_table[] = { .maxlen = sizeof(int), .mode = 0644, .proc_handler = proc_handler_loadpin, - .extra1 = SYSCTL_ZERO, - .extra2 = SYSCTL_ONE, + .min = 0, + .max = 1, }, }; #endif -- 2.25.1