From 7a966fbd78683fe4ff7f019fd80fc08d9753880b Mon Sep 17 00:00:00 2001 From: Masami Ichikawa Date: Wed, 23 Apr 2014 23:35:22 +0900 Subject: [PATCH] fbcon: Fix memory leak in con2fb_release_oldinfo() kmemleak reported a memory leak as below. unreferenced object 0xffff8800dab6d8d8 (size 96): comm "swapper/0", pid 1, jiffies 4294877598 (age 38.483s) hex dump (first 32 bytes): 00 00 00 00 00 01 00 00 08 00 00 00 10 00 00 00 ................ 07 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00 ................ backtrace: [] kmemleak_alloc+0x4e/0xb0 [] __kmalloc+0x280/0x320 [] soft_cursor+0x231/0x290 [] bit_cursor+0x613/0x650 [] fbcon_cursor+0x13b/0x1c0 [] hide_cursor+0x28/0xa0 [] redraw_screen+0x168/0x240 [] fbcon_prepare_logo+0x381/0x420 [] fbcon_init+0x34e/0x590 [] visual_init+0xb8/0x120 [] do_bind_con_driver+0x163/0x380 [] do_take_over_console+0x114/0x1c0 [] do_fbcon_takeover+0x63/0xd0 [] fbcon_event_notify+0x68d/0x7e0 [] notifier_call_chain+0x4c/0x70 [] __blocking_notifier_call_chain+0x4d/0x70 This memory leak cause is, fbcon_ops's cursor_src is allocated in soft_cursor() but not released in con2fb_release_oldinfo(). so, cursor_src is needed to be released when oldinfo is going to be released. Signed-off-by: Masami Ichikawa Signed-off-by: Tomi Valkeinen --- drivers/video/console/fbcon.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c index f447734b09b4..57b1d44acbfe 100644 --- a/drivers/video/console/fbcon.c +++ b/drivers/video/console/fbcon.c @@ -748,6 +748,7 @@ static int con2fb_release_oldinfo(struct vc_data *vc, struct fb_info *oldinfo, fbcon_del_cursor_timer(oldinfo); kfree(ops->cursor_state.mask); kfree(ops->cursor_data); + kfree(ops->cursor_src); kfree(ops->fontbuffer); kfree(oldinfo->fbcon_par); oldinfo->fbcon_par = NULL;