Commit e08c30ef authored by Dan Carpenter's avatar Dan Carpenter Committed by Helge Deller
Browse files

fbdev: imsttfb: fix double free in probe() 



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: 518ecb6a ("fbdev: imsttfb: Fix error path of imsttfb_probe()")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent 3e91a38d

drivers/video/fbdev/imsttfb.c

+1 −5
Original line number Diff line number Diff line
@@ -1421,7 +1421,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;

	}
@@ -1453,14 +1452,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;

	}