iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

consolemap: Fix a memory leaking bug in drivers/tty/vt/consolemap.c

Browse Source 
In function con_insert_unipair(), when allocation for p2 and p1[n]
fails, ENOMEM is returned, but previously allocated p1 is not freed,
remains as leaking memory. Thus we should free p1 as well when this
allocation fails.

Signed-off-by: Gen Zhang <blackgod016574@gmail.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Gen Zhang 2019-05-23 08:34:52 +08:00 committed by Greg Kroah-Hartman
parent 06aaa3d066
commit 84ecc2f6eb
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/tty/vt/consolemap.c
View File

@ -489,7 +489,11 @@ con_insert_unipair(struct uni_pagedir *p, u_short unicode, u_short fontpos)
p2 = p1[n = (unicode >> 6) & 0x1f]; p2 = p1[n = (unicode >> 6) & 0x1f];
if (!p2) { if (!p2) {
p2 = p1[n] = kmalloc_array(64, sizeof(u16), GFP_KERNEL); p2 = p1[n] = kmalloc_array(64, sizeof(u16), GFP_KERNEL);
if (!p2) return -ENOMEM; if (!p2) {
kfree(p1);
p->uni_pgdir[n] = NULL;
return -ENOMEM;
}
memset(p2, 0xff, 64*sizeof(u16)); /* No glyphs for the characters (yet) */ memset(p2, 0xff, 64*sizeof(u16)); /* No glyphs for the characters (yet) */
} }