Re: [PATCH][next][V2] dmaengine: ti: omap-dma: don't allow a null od->plat pointer to be dereferenced
From: Peter Ujfalusi
Date: Thu Jan 09 2020 - 10:33:08 EST
Colin,
On 09/01/2020 15.19, 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 -ENODEV errror rather when the platform data is null and
> change the warning to an appropriate error message.
Thank you for the update!
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>
> ---
>
> V2: return -ENODEV and change warning to an error message as suggested by
> Peter Ujfalusi.
> ---
> drivers/dma/ti/omap-dma.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/dma/ti/omap-dma.c b/drivers/dma/ti/omap-dma.c
> index fc8f7b2fc7b3..a93515015dce 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)
> - dev_warn(&pdev->dev, "no sdma auxdata needed?\n");
> + if (!od->plat) {
> + dev_err(&pdev->dev, "omap_system_dma_plat_info is missing");
> + return -ENODEV;
> + }
> } else {
> od->cfg = &default_cfg;
>
>
- PÃter
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki