Skip to content

Commit

Permalink
fbdev: imsttfb: Fix use after free bug in imsttfb_probe
Browse files Browse the repository at this point in the history
[ Upstream commit c75f5a5 ]

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>
  • Loading branch information
Zheng Wang authored and gregkh committed Jun 9, 2023
1 parent 3e336ad commit c6c0a9f
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions drivers/video/fbdev/imsttfb.c
Original file line number Diff line number Diff line change
Expand Up @@ -1347,7 +1347,7 @@ static const struct fb_ops imsttfb_ops = {
.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;
__u32 i, tmp, *ip, *end;
Expand Down Expand Up @@ -1420,7 +1420,7 @@ static void init_imstt(struct fb_info *info)
|| !(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);
framebuffer_release(info);
return;
return -ENODEV;
}

sprintf(info->fix.id, "IMS TT (%s)", par->ramdac == IBM ? "IBM" : "TVP");
Expand Down Expand Up @@ -1456,12 +1456,13 @@ static void init_imstt(struct fb_info *info)

if (register_framebuffer(info) < 0) {
framebuffer_release(info);
return;
return -ENODEV;
}

tmp = (read_reg_le32(par->dc_regs, SSTATUS) & 0x0f00) >> 8;
fb_info(info, "%s frame buffer; %uMB vram; chip version %u\n",
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)
Expand Down Expand Up @@ -1529,10 +1530,10 @@ static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
if (!par->cmap_regs)
goto error;
info->pseudo_palette = par->palette;
init_imstt(info);

pci_set_drvdata(pdev, info);
return 0;
ret = init_imstt(info);
if (!ret)
pci_set_drvdata(pdev, info);
return ret;

error:
if (par->dc_regs)
Expand Down

0 comments on commit c6c0a9f

Please sign in to comment.