Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e98d9b40 authored by Andres Salomon's avatar Andres Salomon Committed by Linus Torvalds
Browse files

68328fb: fix cmap memory leaks 



- fix cmap leak in removal path

- fix cmap leak when register_framebuffer fails

- check return value of fb_alloc_cmap

Signed-off-by: default avatarAndres Salomon <dilinger@debian.org>
Acked-by: default avatarKrzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 327fc875

drivers/video/68328fb.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -471,9 +471,11 @@ int __init mc68x328fb_init(void) 
	fb_info.pseudo_palette = &mc68x328fb_pseudo_palette;

	fb_info.pseudo_palette = &mc68x328fb_pseudo_palette;

	fb_info.flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN;

	fb_info.flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN;





	fb_alloc_cmap(&fb_info.cmap, 256, 0);

	if (fb_alloc_cmap(&fb_info.cmap, 256, 0))

		return -ENOMEM;





	if (register_framebuffer(&fb_info) < 0) {

	if (register_framebuffer(&fb_info) < 0) {

		fb_dealloc_cmap(&fb_info.cmap);

		return -EINVAL;

		return -EINVAL;

	}

	}
@@ -494,6 +496,7 @@ module_init(mc68x328fb_init); 
static void __exit mc68x328fb_cleanup(void)

static void __exit mc68x328fb_cleanup(void)

{

{

	unregister_framebuffer(&fb_info);

	unregister_framebuffer(&fb_info);

	fb_dealloc_cmap(&fb_info.cmap);

}

}





module_exit(mc68x328fb_cleanup);

module_exit(mc68x328fb_cleanup);