Unverified Commit 3fb09582 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!9532 CVE-2024-37356 

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Jian <liujian56@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/LRUK4EOD7P3BSPSTXIIPTBRHOFUCZOOH/ 
CVE-2024-37356

Kuniyuki Iwashima (1):
  tcp: Fix shift-out-of-bounds in dctcp_update_alpha().

Sagi Grimberg (1):
  params: lift param_set_uint_minmax to common code


-- 
2.34.1
 
https://gitee.com/src-openeuler/kernel/issues/IA7D6N 
 
Link:https://gitee.com/openeuler/kernel/pulls/9532

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 27858387 17a95312

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/ipv4/tcp_dctcp.c

+12 −1
Original line number Diff line number Diff line
@@ -55,7 +55,18 @@ struct dctcp { 
};



static unsigned int dctcp_shift_g __read_mostly = 4; /* g = 1/2^4 */

module_param(dctcp_shift_g, uint, 0644);



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

{

	return param_set_uint_minmax(val, kp, 0, 10);

}



static const struct kernel_param_ops dctcp_shift_g_ops = {

	.set = dctcp_shift_g_set,

	.get = param_get_uint,

};



module_param_cb(dctcp_shift_g, &dctcp_shift_g_ops, &dctcp_shift_g, 0644);

MODULE_PARM_DESC(dctcp_shift_g, "parameter g for updating dctcp_alpha");



static unsigned int dctcp_alpha_on_init __read_mostly = DCTCP_MAX_ALPHA;

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,