Messages in this thread Patch in this message | | | From | Ben Hutchings <> | Date | Sun, 09 Dec 2018 21:50:33 +0000 | Subject | [PATCH 3.16 011/328] serial: pxa: Fix an error handling path in 'serial_pxa_probe()' |
| |
3.16.62-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
commit 95a0e656580fab3128c7bee5f660c50784f53651 upstream.
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> Signed-off-by: Ben Hutchings <ben@decadent.org.uk> --- drivers/tty/serial/pxa.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
--- a/drivers/tty/serial/pxa.c +++ b/drivers/tty/serial/pxa.c @@ -890,7 +890,8 @@ static int serial_pxa_probe(struct platf 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);
| |