Unverified Commit ff0bd050 authored Nov 04, 2024 by openeuler-ci-bot Committed by Gitee Nov 04, 2024

!12924 CVE-2022-48966

Merge Pull Request from: @ci-robot 
 
PR sync from: Zeng Heng <zengheng4@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/PDGDVNJXZDKPNF3ANDMYWGH65DPWW6Z3/ 
Dan Carpenter (2):
  net: mvneta: Prevent out of bounds read in mvneta_config_rss()
  net: mvneta: Fix an out of bounds check


--
2.25.1
 
https://gitee.com/src-openeuler/kernel/issues/IAYRDU 
 
Link:https://gitee.com/openeuler/kernel/pulls/12924

 

Reviewed-by: Xie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>

parents 6b956857 2c379637

drivers/net/ethernet/marvell/mvneta.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -3604,7 +3604,7 @@ static void mvneta_percpu_elect(struct mvneta_port *pp)
		/* Use the cpu associated to the rxq when it is online, in all
		* the other cases, use the cpu 0 which can't be offline.
		*/
		if (cpu_online(pp->rxq_def))
		if (pp->rxq_def < nr_cpu_ids && cpu_online(pp->rxq_def))
		elected_cpu = pp->rxq_def;

		max_cpu = num_present_cpus();