aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJian Shen <shenjian15@huawei.com>2019-07-29 10:53:22 +0800
committerDavid S. Miller <davem@davemloft.net>2019-07-29 08:23:40 -0700
commit44950d28cccf3049696e02d0adebb10e112cee24 (patch)
treeb00400748939da1d3e048a42524094871dc29c60 /drivers
parentMerge branch 'mlxsw-spectrum_acl-Forbid-unsupported-filters' (diff)
downloadlinux-dev-44950d28cccf3049696e02d0adebb10e112cee24.tar.xz
linux-dev-44950d28cccf3049696e02d0adebb10e112cee24.zip
net: hns3: add reset checking before set channels
hns3_set_channels() should check the resetting status firstly, since the device will reinitialize when resetting. If the reset has not completed, the hns3_set_channels() may access invalid memory. 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')
-rw-r--r--drivers/net/ethernet/hisilicon/hns3/hns3_enet.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
index 69f7ef810654..08af782f70b5 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
@@ -4378,6 +4378,9 @@ int hns3_set_channels(struct net_device *netdev,
u16 org_tqp_num;
int ret;
+ if (hns3_nic_resetting(netdev))
+ return -EBUSY;
+
if (ch->rx_count || ch->tx_count)
return -EINVAL;