Commit ba667382 authored Sep 08, 2023 by Hangyu Hua Committed by Greg Kroah-Hartman Sep 23, 2023

net: ethernet: mvpp2_main: fix possible OOB write in mvpp2_ethtool_get_rxnfc()



[ Upstream commit 51fe0a470543f345e3c62b6798929de3ddcedc1d ]

rules is allocated in ethtool_get_rxnfc and the size is determined by
rule_cnt from user space. So rule_cnt needs to be check before using
rules to avoid OOB writing or NULL pointer dereference.

Fixes: 90b509b3 ("net: mvpp2: cls: Add Classification offload support")
Signed-off-by: Hangyu Hua <hbh25y@gmail.com>
Reviewed-by: Marcin Wojtas <mw@semihalf.com>
Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 5624f26a

drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -4233,6 +4233,11 @@ static int mvpp2_ethtool_get_rxnfc(struct net_device *dev,
		break;
		case ETHTOOL_GRXCLSRLALL:
		for (i = 0; i < MVPP2_N_RFS_ENTRIES_PER_FLOW; i++) {
		if (loc == info->rule_cnt) {
		ret = -EMSGSIZE;
		break;
		}

		if (port->rfs_rules[i])
		rules[loc++] = i;
		}