diff options
| author | Jian Shen <shenjian15@huawei.com> | 2021-04-29 16:34:52 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-04-29 15:41:43 -0700 |
| commit | b4047aac4ec1066bab6c71950623746d7bcf7154 (patch) | |
| tree | 3a00a7cca5f853e58ed2ab64bbf1c8f334d02fa4 /drivers/net | |
| parent | 568a54bdf70b143f3e0befa298e22ad469ffc732 (diff) | |
| download | linux-b4047aac4ec1066bab6c71950623746d7bcf7154.tar.bz2 | |
net: hns3: add check for HNS3_NIC_STATE_INITED in hns3_reset_notify_up_enet()
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: bb6b94a896d4 ("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>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c index c21dd11baed9..5dc6de5107fb 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c @@ -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)) { |