The patch titled
Fix memory leak in vc_resize/vc_allocate
has been added to the -mm tree. Its filename is
fix-memory-leak-in-vc_resize-vc_allocate.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: Fix memory leak in vc_resize/vc_allocate
From: Catalin Marinas <catalin.marinas@xxxxxxx>
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@xxxxxxx>
Acked-by: "Antonino A. Daplas" <adaplas@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/char/vt.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletion(-)
diff -puN drivers/char/vt.c~fix-memory-leak-in-vc_resize-vc_allocate drivers/char/vt.c
--- a/drivers/char/vt.c~fix-memory-leak-in-vc_resize-vc_allocate
+++ a/drivers/char/vt.c
@@ -737,7 +737,8 @@ int vc_allocate(unsigned int currcons) /
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;
_
Patches currently in -mm which might be from catalin.marinas@xxxxxxx are
fix-memory-leak-in-vc_resize-vc_allocate.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
