OSDN Git Service

net: dsa: bcm_sf2: Fix overflow checks
authorFlorian Fainelli <f.fainelli@gmail.com>
Mon, 30 Mar 2020 21:38:46 +0000 (14:38 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 31 Mar 2020 02:55:42 +0000 (19:55 -0700)
commitd0802dc411f469569a537283b6f3833af47aece9
tree10a66ff3caee070eae97af4031b75095c28f5b79
parented52f2c608c9451fa2bad298b2ab927416105d65
net: dsa: bcm_sf2: Fix overflow checks

Commit f949a12fd697 ("net: dsa: bcm_sf2: fix buffer overflow doing
set_rxnfc") tried to fix the some user controlled buffer overflows in
bcm_sf2_cfp_rule_set() and bcm_sf2_cfp_rule_del() but the fix was using
CFP_NUM_RULES, which while it is correct not to overflow the bitmaps, is
not representative of what the device actually supports. Correct that by
using bcm_sf2_cfp_rule_size() instead.

The latter subtracts the number of rules by 1, so change the checks from
greater than or equal to greater than accordingly.

Fixes: f949a12fd697 ("net: dsa: bcm_sf2: fix buffer overflow doing set_rxnfc")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/dsa/bcm_sf2_cfp.c