From: Yonglong Liu <liuyonglong@huawei.com> driver inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I9TM2X CVE: CVE-2024-36021 Reference: https://gitee.com/openeuler/kernel/commit/f18e4f63130c196d6a28a0db0af2093d82... -------------------------------- The devlink reload process will access the hardware resources, but the register operation is before the hardware initialize done, so, if process the devlink reload during initializetion, may lead the kernel crash. This patch check whether the NIC is initialized to fix the problem. Fixes: c3141771b0c3 ("net: hns3: add support for registering devlink for VF") Signed-off-by: Yonglong Liu <liuyonglong@huawei.com> Signed-off-by: Jialin Zhang <zhangjialin11@huawei.com> --- drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_devlink.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_devlink.c b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_devlink.c index d209a17927e5..ca8d2287e4ba 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_devlink.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_devlink.c @@ -46,8 +46,9 @@ static int hclgevf_devlink_reload_down(struct devlink *devlink, struct pci_dev *pdev = hdev->pdev; int ret; - if (test_bit(HCLGEVF_STATE_RST_HANDLING, &hdev->state)) { - dev_err(&pdev->dev, "reset is handling\n"); + if (test_bit(HCLGEVF_STATE_RST_HANDLING, &hdev->state) || + !test_bit(HCLGEVF_STATE_NIC_REGISTERED, &hdev->state)) { + dev_err(&pdev->dev, "reset is handling or driver removed\n"); return -EBUSY; } -- 2.31.1