openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: 7318166cac ("net: dsa: bcm_sf2: Add support for ethtool::rxnfc")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Dan Carpenter 2019-04-30 13:44:19 +03:00 committed by David S. Miller
parent b13023421b
commit f949a12fd6
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/dsa/bcm_sf2_cfp.c
View File

@ -886,6 +886,9 @@ static int bcm_sf2_cfp_rule_set(struct dsa_switch *ds, int port,
fs->m_ext.data[1])) fs->m_ext.data[1]))
return -EINVAL; return -EINVAL;
if (fs->location != RX_CLS_LOC_ANY && fs->location >= CFP_NUM_RULES)
return -EINVAL;
if (fs->location != RX_CLS_LOC_ANY && if (fs->location != RX_CLS_LOC_ANY &&
test_bit(fs->location, priv->cfp.used)) test_bit(fs->location, priv->cfp.used))
return -EBUSY; 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; struct cfp_rule *rule;
int ret; int ret;
if (loc >= CFP_NUM_RULES)
return -EINVAL;
/* Refuse deleting unused rules, and those that are not unique since /* Refuse deleting unused rules, and those that are not unique since
* that could leave IPv6 rules with one of the chained rule in the * that could leave IPv6 rules with one of the chained rule in the
* table. * table.