net: hns3: adjust hns3_uninit_phy()'s location in the hns3_client_uninit() (0d2f68c7) · Commits · 戴 / test

hns3_uninit_phy() should be called before checking HNS3_NIC_STATE_INITED flags, otherwise when this checking fails, there is nobody to call hns3_uninit_phy(). Fixes: ("net: hns3: Fix NULL deref when unloading driver") Signed-off-by:

Huazhong Tan <tanhuazhong@huawei.com> Signed-off-by:

Peng Li <lipeng321@huawei.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/ethernet/hisilicon/hns3/hns3_enet.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -3901,6 +3901,8 @@ static void hns3_client_uninit(struct hnae3_handle *handle, bool reset)

		hns3_client_stop(handle);

		hns3_uninit_phy(netdev);

		if (!test_and_clear_bit(HNS3_NIC_STATE_INITED, &priv->state)) {
		netdev_warn(netdev, "already uninitialized\n");
		goto out_netdev_free;
		@@ -3910,8 +3912,6 @@ static void hns3_client_uninit(struct hnae3_handle *handle, bool reset)

		hns3_force_clear_all_rx_ring(handle);

		hns3_uninit_phy(netdev);

		hns3_nic_uninit_vector_data(priv);

		ret = hns3_nic_dealloc_vector_data(priv);

Admin message