* [PATCH 12/15] 68328fb: fix cmap memory leaks
@ 2009-02-07 17:18 Andres Salomon
2009-02-09 20:07 ` [Linux-fbdev-devel] " Krzysztof Helt
0 siblings, 1 reply; 2+ messages in thread
From: Andres Salomon @ 2009-02-07 17:18 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel, linux-fbdev-devel, adaplas
- 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 <dilinger@debian.org>
---
drivers/video/68328fb.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/drivers/video/68328fb.c b/drivers/video/68328fb.c
index 7f907fb..0b17824 100644
--- a/drivers/video/68328fb.c
+++ b/drivers/video/68328fb.c
@@ -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);
--
1.5.6.5
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [Linux-fbdev-devel] [PATCH 12/15] 68328fb: fix cmap memory leaks
2009-02-07 17:18 [PATCH 12/15] 68328fb: fix cmap memory leaks Andres Salomon
@ 2009-02-09 20:07 ` Krzysztof Helt
0 siblings, 0 replies; 2+ messages in thread
From: Krzysztof Helt @ 2009-02-09 20:07 UTC (permalink / raw)
To: Andres Salomon; +Cc: Andrew Morton, linux-fbdev-devel, linux-kernel, adaplas
On Sat, 7 Feb 2009 12:18:40 -0500
Andres Salomon <dilinger@queued.net> wrote:
>
> - 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 <dilinger@debian.org>
> ---
Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl>
> drivers/video/68328fb.c | 5 ++++-
> 1 files changed, 4 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/video/68328fb.c b/drivers/video/68328fb.c
> index 7f907fb..0b17824 100644
> --- a/drivers/video/68328fb.c
> +++ b/drivers/video/68328fb.c
> @@ -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);
> --
> 1.5.6.5
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-02-09 20:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-02-07 17:18 [PATCH 12/15] 68328fb: fix cmap memory leaks Andres Salomon
2009-02-09 20:07 ` [Linux-fbdev-devel] " Krzysztof Helt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox