| From foo@baz Thu 09 Apr 2020 04:04:49 PM CEST |
| From: Jisheng Zhang <Jisheng.Zhang@synaptics.com> |
| Date: Fri, 3 Apr 2020 10:23:29 +0800 |
| Subject: net: stmmac: dwmac1000: fix out-of-bounds mac address reg setting |
| |
| From: Jisheng Zhang <Jisheng.Zhang@synaptics.com> |
| |
| [ Upstream commit 3e1221acf6a8f8595b5ce354bab4327a69d54d18 ] |
| |
| Commit 9463c4455900 ("net: stmmac: dwmac1000: Clear unused address |
| entries") cleared the unused mac address entries, but introduced an |
| out-of bounds mac address register programming bug -- After setting |
| the secondary unicast mac addresses, the "reg" value has reached |
| netdev_uc_count() + 1, thus we should only clear address entries |
| if (addr < perfect_addr_number) |
| |
| Fixes: 9463c4455900 ("net: stmmac: dwmac1000: Clear unused address entries") |
| Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c |
| +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c |
| @@ -214,7 +214,7 @@ static void dwmac1000_set_filter(struct |
| reg++; |
| } |
| |
| - while (reg <= perfect_addr_number) { |
| + while (reg < perfect_addr_number) { |
| writel(0, ioaddr + GMAC_ADDR_HIGH(reg)); |
| writel(0, ioaddr + GMAC_ADDR_LOW(reg)); |
| reg++; |
