net: hns3: add protect when handling mac addr list

[ Upstream commit 389775a6605e040dddea21a778a88eaaa57c068d ]

It used netdev->uc and netdev->mc list in function
hns3_recover_hw_addr() and hns3_remove_hw_addr().
We should add protect for them.

Fixes: f05e21097121 ("net: hns3: Clear mac vlan table entries when unload driver or function reset")
Signed-off-by: Jian Shen <shenjian15@huawei.com>
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
index fb5cb15aea9ec65641732d26e0358a75efdfaad4..a6481bd34c3bbcf1f3e1f2d9e0c2b14f5ce76d76 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
@@ -3794,12 +3794,13 @@ static int hns3_recover_hw_addr(struct net_device *ndev)
        struct netdev_hw_addr *ha, *tmp;
        int ret = 0;
 
+       netif_addr_lock_bh(ndev);
        /* go through and sync uc_addr entries to the device */
        list = &ndev->uc;
        list_for_each_entry_safe(ha, tmp, &list->list, list) {
                ret = hns3_nic_uc_sync(ndev, ha->addr);
                if (ret)
-                       return ret;
+                       goto out;
        }
 
        /* go through and sync mc_addr entries to the device */
@@ -3807,9 +3808,11 @@ static int hns3_recover_hw_addr(struct net_device *ndev)
        list_for_each_entry_safe(ha, tmp, &list->list, list) {
                ret = hns3_nic_mc_sync(ndev, ha->addr);
                if (ret)
-                       return ret;
+                       goto out;
        }
 
+out:
+       netif_addr_unlock_bh(ndev);
        return ret;
 }
 
@@ -3820,6 +3823,7 @@ static void hns3_remove_hw_addr(struct net_device *netdev)
 
        hns3_nic_uc_unsync(netdev, netdev->dev_addr);
 
+       netif_addr_lock_bh(netdev);
        /* go through and unsync uc_addr entries to the device */
        list = &netdev->uc;
        list_for_each_entry_safe(ha, tmp, &list->list, list)
@@ -3830,6 +3834,8 @@ static void hns3_remove_hw_addr(struct net_device *netdev)
        list_for_each_entry_safe(ha, tmp, &list->list, list)
                if (ha->refcount > 1)
                        hns3_nic_mc_unsync(netdev, ha->addr);
+
+       netif_addr_unlock_bh(netdev);
 }
 
 static void hns3_clear_tx_ring(struct hns3_enet_ring *ring)