Skip to content

Commit

Permalink
consolemap: Fix a memory leaking bug in drivers/tty/vt/consolemap.c
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Gen Zhang authored and Greg Kroah-Hartman committed May 24, 2019
1 parent 06aaa3d commit 84ecc2f
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion drivers/tty/vt/consolemap.c
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,11 @@ con_insert_unipair(struct uni_pagedir *p, u_short unicode, u_short fontpos)
p2 = p1[n = (unicode >> 6) & 0x1f];
if (!p2) {
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) */
}

Expand Down

0 comments on commit 84ecc2f

Please sign in to comment.