tty: serial: 8250: serial_cs: Fix a memory leak in error handling path
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Tue, 25 May 2021 19:44:04 +0000 (21:44 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 20 Jul 2021 14:17:49 +0000 (16:17 +0200)
[ 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

index ba9731ace0e4d57e9e674a96a3a0919307c19340..3747991024d519468462ebc666a2d09fcb85196b 100644 (file)
@@ -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)