| From a8628b6bf5ad9954e1be623b8043c09e5358ef29 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 25 May 2021 21:44:04 +0200 |
| Subject: tty: serial: 8250: serial_cs: Fix a memory leak in error handling |
| path |
| |
| 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 1cc749903d12..ff6a95a35226 100644 |
| --- a/drivers/tty/serial/8250/serial_cs.c |
| +++ b/drivers/tty/serial/8250/serial_cs.c |
| @@ -306,6 +306,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"); |
| |
| @@ -320,7 +321,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 |
| |