Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e249d3b authored by Fuyun Liang's avatar Fuyun Liang Committed by David S. Miller
Browse files

net: hns3: Fix for the null pointer problem occurring when initializing ae_dev failed 



When initializing ae_dev failed during loading hclge.ko, the drvdata will
be set to null. When removing hns3.ko, we get a null ae_dev. It causes the
null pointer problem.

This patch removes pci_set_drvdata from error handle of hclge_init_ae_dev
to fix the bug, since pci_set_drvdata has been called in hns3_remove.
Also, we do not need to uninit the ae_dev which is not initialized. And
it may be the one which is initialized failed.

Fixes: 46a3df9f ("net: hns3: Add HNS3 Acceleration Engine & Compatibility Layer Support")
Signed-off-by: default avatarFuyun Liang <liangfuyun1@huawei.com>
Signed-off-by: default avatarPeng Li <lipeng321@huawei.com>
Signed-off-by: default avatarSalil Mehta <salil.mehta@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2312e050

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

+6 −0
Original line number Original line Diff line number Diff line
@@ -168,6 +168,9 @@ void hnae3_unregister_ae_algo(struct hnae3_ae_algo *ae_algo) 
	mutex_lock(&hnae3_common_lock);

	mutex_lock(&hnae3_common_lock);

	/* Check if there are matched ae_dev */

	/* Check if there are matched ae_dev */

	list_for_each_entry(ae_dev, &hnae3_ae_dev_list, node) {

	list_for_each_entry(ae_dev, &hnae3_ae_dev_list, node) {

		if (!hnae_get_bit(ae_dev->flag, HNAE3_DEV_INITED_B))

			continue;



		id = pci_match_id(ae_algo->pdev_id_table, ae_dev->pdev);

		id = pci_match_id(ae_algo->pdev_id_table, ae_dev->pdev);

		if (!id)

		if (!id)

			continue;

			continue;
@@ -256,6 +259,9 @@ void hnae3_unregister_ae_dev(struct hnae3_ae_dev *ae_dev) 
	mutex_lock(&hnae3_common_lock);

	mutex_lock(&hnae3_common_lock);

	/* Check if there are matched ae_algo */

	/* Check if there are matched ae_algo */

	list_for_each_entry(ae_algo, &hnae3_ae_algo_list, node) {

	list_for_each_entry(ae_algo, &hnae3_ae_algo_list, node) {

		if (!hnae_get_bit(ae_dev->flag, HNAE3_DEV_INITED_B))

			continue;



		id = pci_match_id(ae_algo->pdev_id_table, ae_dev->pdev);

		id = pci_match_id(ae_algo->pdev_id_table, ae_dev->pdev);

		if (!id)

		if (!id)

			continue;

			continue;

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c

+1 −4
Original line number Original line Diff line number Diff line
@@ -5379,7 +5379,7 @@ static int hclge_pci_init(struct hclge_dev *hdev) 
	ret = pci_enable_device(pdev);

	ret = pci_enable_device(pdev);

	if (ret) {

	if (ret) {

		dev_err(&pdev->dev, "failed to enable PCI device\n");

		dev_err(&pdev->dev, "failed to enable PCI device\n");

		goto err_no_drvdata;

		return ret;

	}

	}





	ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));

	ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
@@ -5417,8 +5417,6 @@ static int hclge_pci_init(struct hclge_dev *hdev) 
	pci_release_regions(pdev);

	pci_release_regions(pdev);

err_disable_device:

err_disable_device:

	pci_disable_device(pdev);

	pci_disable_device(pdev);

err_no_drvdata:

	pci_set_drvdata(pdev, NULL);





	return ret;

	return ret;

}

}
@@ -5594,7 +5592,6 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev) 
	pci_clear_master(pdev);

	pci_clear_master(pdev);

	pci_release_regions(pdev);

	pci_release_regions(pdev);

	pci_disable_device(pdev);

	pci_disable_device(pdev);

	pci_set_drvdata(pdev, NULL);

out:

out:

	return ret;

	return ret;

}

}

drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -1563,7 +1563,7 @@ static int hclgevf_pci_init(struct hclgevf_dev *hdev) 
	ret = pci_enable_device(pdev);

	ret = pci_enable_device(pdev);

	if (ret) {

	if (ret) {

		dev_err(&pdev->dev, "failed to enable PCI device\n");

		dev_err(&pdev->dev, "failed to enable PCI device\n");

		goto err_no_drvdata;

		return ret;

	}

	}





	ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));

	ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
@@ -1595,8 +1595,7 @@ static int hclgevf_pci_init(struct hclgevf_dev *hdev) 
	pci_release_regions(pdev);

	pci_release_regions(pdev);

err_disable_device:

err_disable_device:

	pci_disable_device(pdev);

	pci_disable_device(pdev);

err_no_drvdata:



	pci_set_drvdata(pdev, NULL);

	return ret;

	return ret;

}

}
@@ -1608,7 +1607,6 @@ static void hclgevf_pci_uninit(struct hclgevf_dev *hdev) 
	pci_clear_master(pdev);

	pci_clear_master(pdev);

	pci_release_regions(pdev);

	pci_release_regions(pdev);

	pci_disable_device(pdev);

	pci_disable_device(pdev);

	pci_set_drvdata(pdev, NULL);

}

}





static int hclgevf_init_hdev(struct hclgevf_dev *hdev)

static int hclgevf_init_hdev(struct hclgevf_dev *hdev)