lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 547/917] ipmi: kcs_bmc: Fix a memory leak in the error handling path of kcs_bmc_serio_add_device()
    Date
    From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

    [ Upstream commit f281d010b87454e72475b668ad66e34961f744e0 ]

    In the unlikely event where 'devm_kzalloc()' fails and 'kzalloc()'
    succeeds, 'port' would be leaking.

    Test each allocation separately to avoid the leak.

    Fixes: 3a3d2f6a4c64 ("ipmi: kcs_bmc: Add serio adaptor")
    Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
    Message-Id: <ecbfa15e94e64f4b878ecab1541ea46c74807670.1631048724.git.christophe.jaillet@wanadoo.fr>
    Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
    Signed-off-by: Corey Minyard <cminyard@mvista.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/char/ipmi/kcs_bmc_serio.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/char/ipmi/kcs_bmc_serio.c b/drivers/char/ipmi/kcs_bmc_serio.c
    index 7948cabde50b4..7e2067628a6ce 100644
    --- a/drivers/char/ipmi/kcs_bmc_serio.c
    +++ b/drivers/char/ipmi/kcs_bmc_serio.c
    @@ -73,10 +73,12 @@ static int kcs_bmc_serio_add_device(struct kcs_bmc_device *kcs_bmc)
    struct serio *port;

    priv = devm_kzalloc(kcs_bmc->dev, sizeof(*priv), GFP_KERNEL);
    + if (!priv)
    + return -ENOMEM;

    /* Use kzalloc() as the allocation is cleaned up with kfree() via serio_unregister_port() */
    port = kzalloc(sizeof(*port), GFP_KERNEL);
    - if (!(priv && port))
    + if (!port)
    return -ENOMEM;

    port->id.type = SERIO_8042;
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-16 00:45    [W:2.698 / U:0.636 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site