lkml.org 
[lkml]   [2019]   [Jul]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.2 014/171] consolemap: Fix a memory leaking bug in drivers/tty/vt/consolemap.c
    Date
    From: Gen Zhang <blackgod016574@gmail.com>

    [ Upstream commit 84ecc2f6eb1cb12e6d44818f94fa49b50f06e6ac ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/tty/vt/consolemap.c | 6 +++++-
    1 file changed, 5 insertions(+), 1 deletion(-)

    diff --git a/drivers/tty/vt/consolemap.c b/drivers/tty/vt/consolemap.c
    index b28aa0d289f8..79fcc96cc7c0 100644
    --- a/drivers/tty/vt/consolemap.c
    +++ b/drivers/tty/vt/consolemap.c
    @@ -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) */
    }

    --
    2.20.1
    \
     
     \ /
      Last update: 2019-07-19 05:57    [W:4.249 / U:0.284 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site