Re: [PATCH][next] dmaengine: ti: omap-dma: don't allow a null od->plat pointer to be dereferenced

From: Peter Ujfalusi
Date: Tue Jan 07 2020 - 06:59:40 EST


Colin,

On 06/01/2020 14.23, Colin King wrote:
> From: Colin Ian King <colin.king@xxxxxxxxxxxxx>
>
> Currently when the call to dev_get_platdata returns null the driver issues
> a warning and then later dereferences the null pointer. Avoid this issue
> by returning -EPROBE_DEFER errror rather when the platform data is null.

Thank you for noticing it!

Acked-by: Peter Ujfalusi <peter.ujfalusi@xxxxxx>

> Addresses-Coverity: ("Dereference after null check")
> Fixes: 211010aeb097 ("dmaengine: ti: omap-dma: Pass sdma auxdata to driver and use it")
> Signed-off-by: Colin Ian King <colin.king@xxxxxxxxxxxxx>
> ---
> drivers/dma/ti/omap-dma.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/dma/ti/omap-dma.c b/drivers/dma/ti/omap-dma.c
> index fc8f7b2fc7b3..335c3fa7a3b1 100644
> --- a/drivers/dma/ti/omap-dma.c
> +++ b/drivers/dma/ti/omap-dma.c
> @@ -1658,8 +1658,10 @@ static int omap_dma_probe(struct platform_device *pdev)
> if (conf) {
> od->cfg = conf;
> od->plat = dev_get_platdata(&pdev->dev);
> - if (!od->plat)
> + if (!od->plat) {
> dev_warn(&pdev->dev, "no sdma auxdata needed?\n");
> + return -EPROBE_DEFER;
> + }
> } else {
> od->cfg = &default_cfg;
>
>

- PÃter

Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki