Commit 36a7d3de authored by Dan Carpenter's avatar Dan Carpenter Committed by Zeng Heng
Browse files

net: mvneta: Prevent out of bounds read in mvneta_config_rss() 

stable inclusion
from stable-4.19.269
commit 5a142486a0db6b0b85031f22d69acd0cdcf8f72b
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAYRDU
CVE: CVE-2022-48966

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



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

[ Upstream commit e8b4fc13 ]

The pp->indir[0] value comes from the user.  It is passed to:

	if (cpu_online(pp->rxq_def))

inside the mvneta_percpu_elect() function.  It needs bounds checkeding
to ensure that it is not beyond the end of the cpu bitmap.

Fixes: cad5d847 ("net: mvneta: Fix the CPU choice in mvneta_percpu_elect")
Signed-off-by: default avatarDan Carpenter <error27@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarZeng Heng <zengheng4@huawei.com>
parent e833ccea

drivers/net/ethernet/marvell/mvneta.c

+3 −0
Original line number Diff line number Diff line
@@ -4120,6 +4120,9 @@ static int mvneta_config_rss(struct mvneta_port *pp) 
		napi_disable(&pp->napi);

	}



	if (pp->indir[0] >= nr_cpu_ids)

		return -EINVAL;



	pp->rxq_def = pp->indir[0];



	/* Update unicast mapping */