| From foo@baz Thu May 24 11:23:00 CEST 2018 |
| From: Geert Uytterhoeven <geert+renesas@glider.be> |
| Date: Fri, 23 Feb 2018 14:38:34 +0100 |
| Subject: serial: samsung: Fix out-of-bounds access through serial port index |
| |
| From: Geert Uytterhoeven <geert+renesas@glider.be> |
| |
| [ Upstream commit 49ee23b71877831ac087d6083f6f397dc19c9664 ] |
| |
| The s3c24xx_serial_ports[] array is indexed using a value derived from |
| the "serialN" alias in DT, or from an incrementing probe index, which |
| may lead to an out-of-bounds access. |
| |
| Fix this by adding a range check. |
| |
| Note that the array size is defined by a Kconfig symbol |
| (CONFIG_SERIAL_SAMSUNG_UARTS), so this can even be triggered using |
| a legitimate DTB or legitimate board code. |
| |
| Fixes: 13a9f6c64fdc55eb ("serial: samsung: Consider DT alias when probing ports") |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/tty/serial/samsung.c | 4 ++++ |
| 1 file changed, 4 insertions(+) |
| |
| --- a/drivers/tty/serial/samsung.c |
| +++ b/drivers/tty/serial/samsung.c |
| @@ -1813,6 +1813,10 @@ static int s3c24xx_serial_probe(struct p |
| |
| dbg("s3c24xx_serial_probe(%p) %d\n", pdev, index); |
| |
| + if (index >= ARRAY_SIZE(s3c24xx_serial_ports)) { |
| + dev_err(&pdev->dev, "serial%d out of range\n", index); |
| + return -EINVAL; |
| + } |
| ourport = &s3c24xx_serial_ports[index]; |
| |
| ourport->drv_data = s3c24xx_get_driver_data(pdev); |