68328fb: fix cmap memory leaks
PATCH 12/15 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 Andres Salomon <[email protected]>
--- drivers/video/68328fb.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)
drivers/video/68328fb.c +4 -1
@@ -471,9 +471,11 @@ int __init mc68x328fb_init(void) fb_info.pseudo_palette = &mc68x328fb_pseudo_palette; 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 ) { +fb_dealloc_cmap (&fb_info.cmap);return -EINVAL ; }
@@ -494,6 +496,7 @@ module_init(mc68x328fb_init); static void __exit mc68x328fb_cleanup(void) {unregister_framebuffer (&fb_info); +fb_dealloc_cmap (&fb_info.cmap); }module_exit (mc68x328fb_cleanup);
Signature · 9 lines
1.5.6.5 ------------------------------------------------------------------------------ Create and Deploy Rich Internet Apps outside the browser with Adobe(R)AIR(TM) software. With Adobe AIR, Ajax developers can use existing skills and code to build responsive, highly engaging applications that combine the power of local resources and data with the reach of the web. Download the Adobe AIR SDK and Ajax docs to start building applications today-http://p.sf.net/sfu/adobe-com
Quoted 7 lines · On Sat, 7 Feb 2009 12:18:40 -0500 Andres Salomon <[email protected]> wrote:
- fix cmap leak in removal path
- fix cmap leak whenregister_framebufferfails
- check return value offb_alloc_cmapSigned-off-by Andres Salomon <[email protected]>---
Acked-by Krzysztof Helt <[email protected]>
Quoted 31 lines
drivers/video/68328fb.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)drivers/video/68328fb.c +4
-1@@ -471,9 +471,11 @@ int __init mc68x328fb_init(void) fb_info.pseudo_palette = &mc68x328fb_pseudo_palette; 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 ) { +fb_dealloc_cmap (&fb_info.cmap);return -EINVAL ; }@@ -494,6 +496,7 @@ module_init(mc68x328fb_init); static void __exit mc68x328fb_cleanup(void) {unregister_framebuffer (&fb_info); +fb_dealloc_cmap (&fb_info.cmap); }module_exit (mc68x328fb_cleanup);Signature · 1 line
1.5.6.5