fbdev: imsttfb: Fix use after free bug in imsttfb_probe
[ Upstream commit c75f5a5506
]
A use-after-free bug may occur if init_imstt invokes framebuffer_release
and free the info ptr. The caller, imsttfb_probe didn't notice that and
still keep the ptr as private data in pdev.
If we remove the driver which will call imsttfb_remove to make cleanup,
UAF happens.
Fix it by return error code if bad case happens in init_imstt.
Signed-off-by: Zheng Wang <zyytlz.wz@163.com>
Signed-off-by: Helge Deller <deller@gmx.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Родитель
fd8b4e28f4
Коммит
ad3de274e0
|
@ -1346,7 +1346,7 @@ static const struct fb_ops imsttfb_ops = {
|
||||||
.fb_ioctl = imsttfb_ioctl,
|
.fb_ioctl = imsttfb_ioctl,
|
||||||
};
|
};
|
||||||
|
|
||||||
static void init_imstt(struct fb_info *info)
|
static int init_imstt(struct fb_info *info)
|
||||||
{
|
{
|
||||||
struct imstt_par *par = info->par;
|
struct imstt_par *par = info->par;
|
||||||
__u32 i, tmp, *ip, *end;
|
__u32 i, tmp, *ip, *end;
|
||||||
|
@ -1419,7 +1419,7 @@ static void init_imstt(struct fb_info *info)
|
||||||
|| !(compute_imstt_regvals(par, info->var.xres, info->var.yres))) {
|
|| !(compute_imstt_regvals(par, info->var.xres, info->var.yres))) {
|
||||||
printk("imsttfb: %ux%ux%u not supported\n", info->var.xres, info->var.yres, info->var.bits_per_pixel);
|
printk("imsttfb: %ux%ux%u not supported\n", info->var.xres, info->var.yres, info->var.bits_per_pixel);
|
||||||
framebuffer_release(info);
|
framebuffer_release(info);
|
||||||
return;
|
return -ENODEV;
|
||||||
}
|
}
|
||||||
|
|
||||||
sprintf(info->fix.id, "IMS TT (%s)", par->ramdac == IBM ? "IBM" : "TVP");
|
sprintf(info->fix.id, "IMS TT (%s)", par->ramdac == IBM ? "IBM" : "TVP");
|
||||||
|
@ -1455,12 +1455,13 @@ static void init_imstt(struct fb_info *info)
|
||||||
|
|
||||||
if (register_framebuffer(info) < 0) {
|
if (register_framebuffer(info) < 0) {
|
||||||
framebuffer_release(info);
|
framebuffer_release(info);
|
||||||
return;
|
return -ENODEV;
|
||||||
}
|
}
|
||||||
|
|
||||||
tmp = (read_reg_le32(par->dc_regs, SSTATUS) & 0x0f00) >> 8;
|
tmp = (read_reg_le32(par->dc_regs, SSTATUS) & 0x0f00) >> 8;
|
||||||
fb_info(info, "%s frame buffer; %uMB vram; chip version %u\n",
|
fb_info(info, "%s frame buffer; %uMB vram; chip version %u\n",
|
||||||
info->fix.id, info->fix.smem_len >> 20, tmp);
|
info->fix.id, info->fix.smem_len >> 20, tmp);
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
||||||
|
@ -1523,10 +1524,10 @@ static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
||||||
if (!par->cmap_regs)
|
if (!par->cmap_regs)
|
||||||
goto error;
|
goto error;
|
||||||
info->pseudo_palette = par->palette;
|
info->pseudo_palette = par->palette;
|
||||||
init_imstt(info);
|
ret = init_imstt(info);
|
||||||
|
if (!ret)
|
||||||
pci_set_drvdata(pdev, info);
|
pci_set_drvdata(pdev, info);
|
||||||
return 0;
|
return ret;
|
||||||
|
|
||||||
error:
|
error:
|
||||||
if (par->dc_regs)
|
if (par->dc_regs)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче