Unverified Commit 77552a63 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!5928 [sync] PR-5863: CVE-2024-26788 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/5863 
 
PR sync from: Hongbo Li <lihongbo22@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/FAGLWUHLH6EJ4YJQRA5BLMMMINXHTPMT/ 
fix CVE-2024-26788

Curtis Klein (1):
  [Backport] dmaengine: fsl-qdma: init irq after reg initialization


-- 
2.34.1
 
https://gitee.com/src-openeuler/kernel/issues/I9E46I 
 
Link:https://gitee.com/openeuler/kernel/pulls/5928

 

Reviewed-by: default avatarZhang Jianhua <chris.zjh@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents c6a1dee4 0ac70f3d

drivers/dma/fsl-qdma.c

+8 −9
Original line number Diff line number Diff line
@@ -1201,10 +1201,6 @@ static int fsl_qdma_probe(struct platform_device *pdev) 
	if (!fsl_qdma->queue)

		return -ENOMEM;



	ret = fsl_qdma_irq_init(pdev, fsl_qdma);

	if (ret)

		return ret;



	fsl_qdma->irq_base = platform_get_irq_byname(pdev, "qdma-queue0");

	if (fsl_qdma->irq_base < 0)

		return fsl_qdma->irq_base;
@@ -1243,16 +1239,19 @@ static int fsl_qdma_probe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, fsl_qdma);



	ret = dma_async_device_register(&fsl_qdma->dma_dev);

	ret = fsl_qdma_reg_init(fsl_qdma);

	if (ret) {

		dev_err(&pdev->dev,

			"Can't register NXP Layerscape qDMA engine.\n");

		dev_err(&pdev->dev, "Can't Initialize the qDMA engine.\n");

		return ret;

	}



	ret = fsl_qdma_reg_init(fsl_qdma);

	ret = fsl_qdma_irq_init(pdev, fsl_qdma);

	if (ret)

		return ret;



	ret = dma_async_device_register(&fsl_qdma->dma_dev);

	if (ret) {

		dev_err(&pdev->dev, "Can't Initialize the qDMA engine.\n");

		dev_err(&pdev->dev, "Can't register NXP Layerscape qDMA engine.\n");

		return ret;

	}