net: dsa: bcm_sf2: fix buffer overflow doing set_rxnfc
Subsystems (5)
PATCH 1/1 net: dsa: bcm_sf2: fix buffer overflow doing set_rxnfc
The "fs->location" is a u32 that comes from the user in ethtool_set_rxnfc(). We can't pass unclamped values to test_bit() or it results in an out of bounds access beyond the end of the bitmap.
Fixes 7318166cacad ("net: dsa: bcm_sf2: Add support for ethtool::rxnfc")
Signed-off-by Dan Carpenter <[email protected]>
--- drivers/net/dsa/bcm_sf2_cfp.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/dsa/bcm_sf2_cfp.c +6 -0
@@ -886,6 +886,9 @@ static int bcm_sf2_cfp_rule_set(struct dsa_switch *ds, int port, fs->m_ext.data[1]))return -EINVAL ; +if (fs->location !=RX_CLS_LOC_ANY && fs->location >=CFP_NUM_RULES ) +return -EINVAL ; +if (fs->location !=RX_CLS_LOC_ANY &&test_bit (fs->location, priv->cfp.used))return -EBUSY ;
@@ -974,6 +977,9 @@ static int bcm_sf2_cfp_rule_del(struct bcm_sf2_priv *priv, int port, u32 loc)struct cfp_rule *rule;int ret; +if (loc >=CFP_NUM_RULES ) +return -EINVAL ; +/* Refuse deleting unused rules, and those that are not unique since * that could leave IPv6 rules with one of the chained rule in the * table.
Signature · 1 line
2.18.0
David Miller
maintainerFrom: Dan Carpenter <[email protected]>
Date: Tue, 30 Apr 2019 13:44:19 +0300
Quoted 6 lines
The "
fs->location" is a u32 that comes from the user inethtool_set_rxnfc(). We can't pass unclamped values totest_bit()or it results in an out of bounds access beyond the end of the bitmap.Fixes 7318166cacad ("net: dsa: bcm_sf2: Add support for ethtool::rxnfc")Signed-off-by Dan Carpenter <[email protected]>
Applied and queued up for -stable, thanks Dan.