From: Catalin Marinas <catalin.marinas@arm.com>
Date: Fri, 29 Sep 2006 09:00:25 +0000 (-0700)
Subject: [PATCH] Fix memory leak in vc_resize/vc_allocate
X-Git-Tag: v2.6.19-rc1~746
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=254e948b2908dd50df9dca4e6ed14b6cc8524fc9;p=linux-2.6

[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>
---

diff --git a/drivers/char/vt.c b/drivers/char/vt.c
index b49f033754..fb75da940b 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 */
 	    visual_init(vc, currcons, 1);
 	    if (!*vc->vc_uni_pagedir_loc)
 		con_set_default_unimap(vc);
-	    vc->vc_screenbuf = kmalloc(vc->vc_screenbuf_size, GFP_KERNEL);
+	    if (!vc->vc_kmalloced)
+		vc->vc_screenbuf = kmalloc(vc->vc_screenbuf_size, GFP_KERNEL);
 	    if (!vc->vc_screenbuf) {
 		kfree(vc);
 		vc_cons[currcons].d = NULL;