lkml.org 
[lkml]   [2021]   [Jul]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.9 06/26] tty: serial: 8250: serial_cs: Fix a memory leak in error handling path
    Date
    From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

    [ Upstream commit fad92b11047a748c996ebd6cfb164a63814eeb2e ]

    In the probe function, if the final 'serial_config()' fails, 'info' is
    leaking.

    Add a resource handling path to free this memory.

    Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
    Link: https://lore.kernel.org/r/dc25f96b7faebf42e60fe8d02963c941cf4d8124.1621971720.git.christophe.jaillet@wanadoo.fr
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/tty/serial/8250/serial_cs.c | 11 ++++++++++-
    1 file changed, 10 insertions(+), 1 deletion(-)

    diff --git a/drivers/tty/serial/8250/serial_cs.c b/drivers/tty/serial/8250/serial_cs.c
    index 8106353ce7aa..38e8045a36cc 100644
    --- a/drivers/tty/serial/8250/serial_cs.c
    +++ b/drivers/tty/serial/8250/serial_cs.c
    @@ -305,6 +305,7 @@ static int serial_resume(struct pcmcia_device *link)
    static int serial_probe(struct pcmcia_device *link)
    {
    struct serial_info *info;
    + int ret;

    dev_dbg(&link->dev, "serial_attach()\n");

    @@ -319,7 +320,15 @@ static int serial_probe(struct pcmcia_device *link)
    if (do_sound)
    link->config_flags |= CONF_ENABLE_SPKR;

    - return serial_config(link);
    + ret = serial_config(link);
    + if (ret)
    + goto free_info;
    +
    + return 0;
    +
    +free_info:
    + kfree(info);
    + return ret;
    }

    static void serial_detach(struct pcmcia_device *link)
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-07-10 04:41    [W:3.540 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site