diff options
| author | Colin Ian King <colin.king@canonical.com> | 2020-01-09 13:19:53 +0000 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2020-01-13 09:36:45 -0800 |
| commit | 994772632f006e97addd20277a820058bb0fd481 (patch) | |
| tree | 88686c7fe7a8512f5c5c66c19aa6258698fce5ff | |
| parent | 37b156ecf71ab74f8e991562f8d13825aaf07512 (diff) | |
| download | linux-omap-omap-for-v5.6/sdma.tar.gz | |
dmaengine: ti: omap-dma: don't allow a null od->plat pointer to be dereferencedomap-for-v5.6/sdma
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 error rather when the platform data is null and
change the warning to an appropriate error message.
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@canonical.com>
Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
| -rw-r--r-- | drivers/dma/ti/omap-dma.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/dma/ti/omap-dma.c b/drivers/dma/ti/omap-dma.c index fc8f7b2fc7b33..a014ab96e6734 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; |