summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>2018-06-11 19:30:35 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-06-28 14:07:54 +0200
commit95a0e656580fab3128c7bee5f660c50784f53651 (patch)
treef14be0f098ebcd796fa5c7ba6043cacfd87d3bb6
parentserial: max310x: Check the clock readiness (diff)
downloadlinux-95a0e656580fab3128c7bee5f660c50784f53651.tar.xz
linux-95a0e656580fab3128c7bee5f660c50784f53651.zip
serial: pxa: Fix an error handling path in 'serial_pxa_probe()'
If port.line is out of range, we still need to release some resources, or we will leak them. Fixes: afc7851fab83 ("serial: pxa: Fix out-of-bounds access through serial port index") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/tty/serial/pxa.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/tty/serial/pxa.c b/drivers/tty/serial/pxa.c
index eda3c7710d6a..4932b674f7ef 100644
--- a/drivers/tty/serial/pxa.c
+++ b/drivers/tty/serial/pxa.c
@@ -887,7 +887,8 @@ static int serial_pxa_probe(struct platform_device *dev)
goto err_clk;
if (sport->port.line >= ARRAY_SIZE(serial_pxa_ports)) {
dev_err(&dev->dev, "serial%d out of range\n", sport->port.line);
- return -EINVAL;
+ ret = -EINVAL;
+ goto err_clk;
}
snprintf(sport->name, PXA_NAME_LEN - 1, "UART%d", sport->port.line + 1);