]> git.baikalelectronics.ru Git - kernel.git/commitdiff
net: hns3: add check for HNS3_NIC_STATE_INITED in hns3_reset_notify_up_enet()
authorJian Shen <shenjian15@huawei.com>
Thu, 29 Apr 2021 08:34:52 +0000 (16:34 +0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 29 Apr 2021 22:41:43 +0000 (15:41 -0700)
In some cases, the device is not initialized because reset failed.
If another task calls hns3_reset_notify_up_enet() before reset
retry, it will cause an error since uninitialized pointer access.
So add check for HNS3_NIC_STATE_INITED before calling
hns3_nic_net_open() in hns3_reset_notify_up_enet().

Fixes: 6c28a5406e49 ("net: hns3: Add reset interface implementation in client")
Signed-off-by: Jian Shen <shenjian15@huawei.com>
Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c

index c21dd11baed913447ba10ae935b836c8f5146597..5dc6de5107fb122919d9ae9661f69a01313556f7 100644 (file)
@@ -4616,6 +4616,11 @@ static int hns3_reset_notify_up_enet(struct hnae3_handle *handle)
        struct hns3_nic_priv *priv = netdev_priv(kinfo->netdev);
        int ret = 0;
 
+       if (!test_bit(HNS3_NIC_STATE_INITED, &priv->state)) {
+               netdev_err(kinfo->netdev, "device is not initialized yet\n");
+               return -EFAULT;
+       }
+
        clear_bit(HNS3_NIC_STATE_RESETTING, &priv->state);
 
        if (netif_running(kinfo->netdev)) {