Skip to content

Commit ad320e4

Browse files
Henry Martindamien-lemoal
authored andcommitted
ata: pata_pxa: Fix potential NULL pointer dereference in pxa_ata_probe()
devm_ioremap() returns NULL on error. Currently, pxa_ata_probe() does not check for this case, which can result in a NULL pointer dereference. Add NULL check after devm_ioremap() to prevent this issue. Fixes: 2dc6c6f ("[ARM] pata_pxa: DMA-capable PATA driver") Signed-off-by: Henry Martin <bsdhenrymartin@gmail.com> Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
1 parent 0af2f6b commit ad320e4

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

drivers/ata/pata_pxa.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,10 +223,16 @@ static int pxa_ata_probe(struct platform_device *pdev)
223223

224224
ap->ioaddr.cmd_addr = devm_ioremap(&pdev->dev, cmd_res->start,
225225
resource_size(cmd_res));
226+
if (!ap->ioaddr.cmd_addr)
227+
return -ENOMEM;
226228
ap->ioaddr.ctl_addr = devm_ioremap(&pdev->dev, ctl_res->start,
227229
resource_size(ctl_res));
230+
if (!ap->ioaddr.ctl_addr)
231+
return -ENOMEM;
228232
ap->ioaddr.bmdma_addr = devm_ioremap(&pdev->dev, dma_res->start,
229233
resource_size(dma_res));
234+
if (!ap->ioaddr.bmdma_addr)
235+
return -ENOMEM;
230236

231237
/*
232238
* Adjust register offsets

0 commit comments

Comments
 (0)