Skip to content

Commit

Permalink
fbdev: imsttfb: fix double free in probe()
Browse files Browse the repository at this point in the history
[ Upstream commit e08c30e ]

The init_imstt() function calls framebuffer_release() on error and then
the probe() function calls it again.  It should only be done in probe.

Fixes: 518ecb6 ("fbdev: imsttfb: Fix error path of imsttfb_probe()")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Signed-off-by: Helge Deller <deller@gmx.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Dan Carpenter authored and gregkh committed Jan 10, 2024
1 parent f2a79f3 commit eb4f2e1
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions drivers/video/fbdev/imsttfb.c
Original file line number Diff line number Diff line change
Expand Up @@ -1419,7 +1419,6 @@ static int init_imstt(struct fb_info *info)
if ((info->var.xres * info->var.yres) * (info->var.bits_per_pixel >> 3) > info->fix.smem_len
|| !(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 -ENODEV;
}

Expand Down Expand Up @@ -1452,14 +1451,11 @@ static int init_imstt(struct fb_info *info)
FBINFO_HWACCEL_FILLRECT |
FBINFO_HWACCEL_YPAN;

if (fb_alloc_cmap(&info->cmap, 0, 0)) {
framebuffer_release(info);
if (fb_alloc_cmap(&info->cmap, 0, 0))
return -ENODEV;
}

if (register_framebuffer(info) < 0) {
fb_dealloc_cmap(&info->cmap);
framebuffer_release(info);
return -ENODEV;
}

Expand Down

0 comments on commit eb4f2e1

Please sign in to comment.