2024-05-14 10:33:10

by Harshit Mogalapalli

Subject: [PATCH v2] media: imx-pxp: fix ERR_PTR dereference in pxp_probe()

devm_regmap_init_mmio() can fail, add a check and bail out in case of
error.

Fixes: 4e5bd3fdbeb3 ("media: imx-pxp: convert to regmap")
Signed-off-by: Harshit Mogalapalli <[email protected]>
---
This is based on static analysis and only compile tested.
v1->v2: fix error message, we dont need %d in dev_err_probe()
---
drivers/media/platform/nxp/imx-pxp.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/drivers/media/platform/nxp/imx-pxp.c b/drivers/media/platform/nxp/imx-pxp.c
index e62dc5c1a4ae..e4427e6487fb 100644
--- a/drivers/media/platform/nxp/imx-pxp.c
+++ b/drivers/media/platform/nxp/imx-pxp.c
@@ -1805,6 +1805,9 @@ static int pxp_probe(struct platform_device *pdev)
return PTR_ERR(mmio);
dev->regmap = devm_regmap_init_mmio(&pdev->dev, mmio,
&pxp_regmap_config);
+ if (IS_ERR(dev->regmap))
+ return dev_err_probe(&pdev->dev, PTR_ERR(dev->regmap),
+ "Failed to init regmap\n");

irq = platform_get_irq(pdev, 0);
if (irq < 0)
--
2.39.3

2024-05-14 14:58:31

by Laurent Pinchart

Subject: Re: [PATCH v2] media: imx-pxp: fix ERR_PTR dereference in pxp_probe()

Hi Harshit,

Thank you for the patch.

On Tue, May 14, 2024 at 02:50:38AM -0700, Harshit Mogalapalli wrote:
> devm_regmap_init_mmio() can fail, add a check and bail out in case of
> error.
>
> Fixes: 4e5bd3fdbeb3 ("media: imx-pxp: convert to regmap")
> Signed-off-by: Harshit Mogalapalli <[email protected]>

Reviewed-by: Laurent Pinchart <[email protected]>

> ---
> This is based on static analysis and only compile tested.
> v1->v2: fix error message, we dont need %d in dev_err_probe()
> ---
> drivers/media/platform/nxp/imx-pxp.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/media/platform/nxp/imx-pxp.c b/drivers/media/platform/nxp/imx-pxp.c
> index e62dc5c1a4ae..e4427e6487fb 100644
> --- a/drivers/media/platform/nxp/imx-pxp.c
> +++ b/drivers/media/platform/nxp/imx-pxp.c
> @@ -1805,6 +1805,9 @@ static int pxp_probe(struct platform_device *pdev)
> return PTR_ERR(mmio);
> dev->regmap = devm_regmap_init_mmio(&pdev->dev, mmio,
> &pxp_regmap_config);
> + if (IS_ERR(dev->regmap))
> + return dev_err_probe(&pdev->dev, PTR_ERR(dev->regmap),
> + "Failed to init regmap\n");
>
> irq = platform_get_irq(pdev, 0);
> if (irq < 0)

--
Regards,

Laurent Pinchart