Skip to content

Commit

Permalink
dmaengine: img-mdc: fix a possible NULL dereference
Browse files Browse the repository at this point in the history
of_match_device could return NULL, and so cause a NULL pointer
dereference later at line 850:
mdma->soc = match->data;

For fixing this problem, we use of_device_get_match_data(), this will
simplify the code a little by using a standard function for
getting the match data.

This was reported by coverity (CID 1324134)

Signed-off-by: LABBE Corentin <clabbe.montjoie@gmail.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
  • Loading branch information
LABBE Corentin authored and Vinod Koul committed Aug 22, 2016
1 parent 6a8b0c6 commit 32e8082
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions drivers/dma/img-mdc-dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -861,7 +861,6 @@ static int mdc_dma_probe(struct platform_device *pdev)
{
struct mdc_dma *mdma;
struct resource *res;
const struct of_device_id *match;
unsigned int i;
u32 val;
int ret;
Expand All @@ -871,8 +870,7 @@ static int mdc_dma_probe(struct platform_device *pdev)
return -ENOMEM;
platform_set_drvdata(pdev, mdma);

match = of_match_device(mdc_dma_of_match, &pdev->dev);
mdma->soc = match->data;
mdma->soc = of_device_get_match_data(&pdev->dev);

res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
mdma->regs = devm_ioremap_resource(&pdev->dev, res);
Expand Down

0 comments on commit 32e8082

Please sign in to comment.