aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorCatalin Marinas <catalin.marinas@arm.com>2006-09-29 05:00:25 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-29 12:18:14 -0400
commit254e948b2908dd50df9dca4e6ed14b6cc8524fc9 (patch)
tree5c3e3cf8c40babc88ae772dce0c90c0c40140baa /drivers
parentbce9a234ce7d8dddbfcec28e37ea58b5d8f6003d (diff)
[PATCH] Fix memory leak in vc_resize/vc_allocate
Memory leaks can happen in the vc_resize() function in drivers/char/vt.c because of the vc->vc_screenbuf variable overriding in vc_allocate(). The kmemleak reported trace is as follows: <__kmalloc> <vc_resize> <fbcon_init> <visual_init> <vc_allocate> <con_open> <tty_open> <chrdev_open> This patch no longer allocates a screen buffer in vc_allocate() if it was already allocated by vc_resize(). Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> Acked-by: "Antonino A. Daplas" <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/char/vt.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/char/vt.c b/drivers/char/vt.c
index b49f03375439..fb75da940b59 100644
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
@@ -737,7 +737,8 @@ int vc_allocate(unsigned int currcons) /* return 0 on success */
737 visual_init(vc, currcons, 1); 737 visual_init(vc, currcons, 1);
738 if (!*vc->vc_uni_pagedir_loc) 738 if (!*vc->vc_uni_pagedir_loc)
739 con_set_default_unimap(vc); 739 con_set_default_unimap(vc);
740 vc->vc_screenbuf = kmalloc(vc->vc_screenbuf_size, GFP_KERNEL); 740 if (!vc->vc_kmalloced)
741 vc->vc_screenbuf = kmalloc(vc->vc_screenbuf_size, GFP_KERNEL);
741 if (!vc->vc_screenbuf) { 742 if (!vc->vc_screenbuf) {
742 kfree(vc); 743 kfree(vc);
743 vc_cons[currcons].d = NULL; 744 vc_cons[currcons].d = NULL;