| From 2ebdb489a959e6751d529d2714e54c1a2b1d232e Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 29 Apr 2021 16:34:52 +0800 |
| Subject: net: hns3: add check for HNS3_NIC_STATE_INITED in |
| hns3_reset_notify_up_enet() |
| |
| From: Jian Shen <shenjian15@huawei.com> |
| |
| [ Upstream commit b4047aac4ec1066bab6c71950623746d7bcf7154 ] |
| |
| 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> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 5 +++++ |
| 1 file changed, 5 insertions(+) |
| |
| diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c |
| index 051598341968..6066cb0a5abb 100644 |
| --- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c |
| +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c |
| @@ -4426,6 +4426,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)) { |
| -- |
| 2.30.2 |
| |