mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-08-31 09:20:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

fbdev: platinumfb: add error checking for ioremap calls

Browse Source 
The ioremap() and ioremap_wt() calls in platinumfb_probe() were not
checked for failure. If any of these mappings fail, the driver would
dereference NULL pointers, leading to a kernel panic.

Add proper error checking and use goto-based cleanup to avoid code
duplication across the error paths.

Signed-off-by: BingKun Yue <yuebingkun@kylinos.cn>
Signed-off-by: Helge Deller <deller@gmx.de>
This commit is contained in:
BingKun Yue
2026-08-17 14:39:42 +08:00
committed by Helge Deller
parent 772bd1a842
commit ba13226fc9
1 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/video/fbdev/platinumfb.c
View File

@@ -567,15 +567,30 @@ static int platinumfb_probe(struct platform_device* odev)
/* frame buffer - map only 4MB */
pinfo->frame_buffer_phys = pinfo->rsrc_fb.start;
pinfo->frame_buffer = ioremap_wt(pinfo->rsrc_fb.start, 0x400000);
if (!pinfo->frame_buffer) {
dev_err(&odev->dev, "failed to ioremap frame buffer\n");
rc = -ENOMEM;
goto err_release_fb;
}
pinfo->base_frame_buffer = pinfo->frame_buffer;
/* registers */
pinfo->platinum_regs_phys = pinfo->rsrc_reg.start;
pinfo->platinum_regs = ioremap(pinfo->rsrc_reg.start, 0x1000);
if (!pinfo->platinum_regs) {
dev_err(&odev->dev, "failed to ioremap registers\n");
rc = -ENOMEM;
goto err_unmap_fb;
}
pinfo->cmap_regs_phys = 0xf301b000; /* XXX not in prom? */
request_mem_region(pinfo->cmap_regs_phys, 0x1000, "platinumfb cmap");
pinfo->cmap_regs = ioremap(pinfo->cmap_regs_phys, 0x1000);
if (!pinfo->cmap_regs) {
dev_err(&odev->dev, "failed to ioremap cmap registers\n");
rc = -ENOMEM;
goto err_release_cmap;
}
/* Grok total video ram */
out_be32(&pinfo->platinum_regs->reg[16].r, (unsigned)pinfo->frame_buffer_phys);
@@ -623,13 +638,21 @@ static int platinumfb_probe(struct platform_device* odev)
dev_set_drvdata(&odev->dev, info);
rc = platinum_init_fb(info);
if (rc != 0) {
iounmap(pinfo->frame_buffer);
iounmap(pinfo->platinum_regs);
iounmap(pinfo->cmap_regs);
framebuffer_release(info);
}
if (rc != 0)
goto err_unmap_cmap;
return 0;
err_unmap_cmap:
iounmap(pinfo->cmap_regs);
err_release_cmap:
release_mem_region(pinfo->cmap_regs_phys, 0x1000);
iounmap(pinfo->platinum_regs);
err_unmap_fb:
iounmap(pinfo->frame_buffer);
err_release_fb:
release_mem_region(pinfo->rsrc_fb.start, resource_size(&pinfo->rsrc_fb));
framebuffer_release(info);
return rc;
}