Commit 2e876eae authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Greg Kroah-Hartman

serial: mxs-auart: Fix out-of-bounds access through serial port index

[ Upstream commit dd345a31 ]

The auart_port[] array is indexed using a value derived from the
"serialN" alias in DT, or from platform data, which may lead to an
out-of-bounds access.

Fix this by adding a range check.

Fixes: 1ea6607d ("serial: mxs-auart: Allow device tree probing")
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2803df30
...@@ -1664,6 +1664,10 @@ static int mxs_auart_probe(struct platform_device *pdev) ...@@ -1664,6 +1664,10 @@ static int mxs_auart_probe(struct platform_device *pdev)
s->port.line = pdev->id < 0 ? 0 : pdev->id; s->port.line = pdev->id < 0 ? 0 : pdev->id;
else if (ret < 0) else if (ret < 0)
return ret; return ret;
if (s->port.line >= ARRAY_SIZE(auart_port)) {
dev_err(&pdev->dev, "serial%d out of range\n", s->port.line);
return -EINVAL;
}
if (of_id) { if (of_id) {
pdev->id_entry = of_id->data; pdev->id_entry = of_id->data;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment