Commit 2e25920c authored by Sagi Grimberg's avatar Sagi Grimberg Committed by Liu Jian
Browse files

params: lift param_set_uint_minmax to common code 

stable inclusion
from stable-v5.10.219
commit 42bd4e491cf150fbf881ad081df14e5d0b12a320
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IA7D6N
CVE: CVE-2024-37356

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=42bd4e491cf150fbf881ad081df14e5d0b12a320



---------------------------

[ Upstream commit 2a14c9ae ]

It is a useful helper hence move it to common code so others can enjoy
it.

Suggested-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarChaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Signed-off-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Stable-dep-of: 3ebc46ca8675 ("tcp: Fix shift-out-of-bounds in dctcp_update_alpha().")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarLiu Jian <liujian56@huawei.com>
parent 3340cc60

include/linux/moduleparam.h

+2 −0
Original line number Diff line number Diff line
@@ -431,6 +431,8 @@ extern int param_get_int(char *buffer, const struct kernel_param *kp); 
extern const struct kernel_param_ops param_ops_uint;

extern int param_set_uint(const char *val, const struct kernel_param *kp);

extern int param_get_uint(char *buffer, const struct kernel_param *kp);

int param_set_uint_minmax(const char *val, const struct kernel_param *kp,

		unsigned int min, unsigned int max);

#define param_check_uint(name, p) __param_check(name, p, unsigned int)



extern const struct kernel_param_ops param_ops_long;

kernel/params.c

+18 −0
Original line number Diff line number Diff line
@@ -243,6 +243,24 @@ STANDARD_PARAM_DEF(ulong, unsigned long, "%lu", kstrtoul); 
STANDARD_PARAM_DEF(ullong,	unsigned long long,	"%llu",		kstrtoull);

STANDARD_PARAM_DEF(hexint,	unsigned int,		"%#08x", 	kstrtouint);



int param_set_uint_minmax(const char *val, const struct kernel_param *kp,

		unsigned int min, unsigned int max)

{

	unsigned int num;

	int ret;



	if (!val)

		return -EINVAL;

	ret = kstrtouint(val, 0, &num);

	if (ret)

		return ret;

	if (num < min || num > max)

		return -EINVAL;

	*((unsigned int *)kp->arg) = num;

	return 0;

}

EXPORT_SYMBOL_GPL(param_set_uint_minmax);



int param_set_charp(const char *val, const struct kernel_param *kp)

{

	if (strlen(val) > 1024) {

net/sunrpc/xprtsock.c

+0 −18
Original line number Diff line number Diff line
@@ -3166,24 +3166,6 @@ void cleanup_socket_xprt(void) 
	xprt_unregister_transport(&xs_bc_tcp_transport);

}



static int param_set_uint_minmax(const char *val,

		const struct kernel_param *kp,

		unsigned int min, unsigned int max)

{

	unsigned int num;

	int ret;



	if (!val)

		return -EINVAL;

	ret = kstrtouint(val, 0, &num);

	if (ret)

		return ret;

	if (num < min || num > max)

		return -EINVAL;

	*((unsigned int *)kp->arg) = num;

	return 0;

}



static int param_set_portnr(const char *val, const struct kernel_param *kp)

{

	return param_set_uint_minmax(val, kp,