Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 926b7b51 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Greg Kroah-Hartman
Browse files

serial: samsung: Fix possible out of bounds access on non-DT platform 



On non-DeviceTree platforms, the index of serial device is a static
variable incremented on each probe.  It is incremented even if deferred
probe happens when getting the clock in s3c24xx_serial_init_port().

This index is used for referencing elements of statically allocated
s3c24xx_serial_ports array.  In case of re-probe, the index will point
outside of this array leading to memory corruption.

Increment the index only on successful probe.

Reported-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Fixes: b497549a ("[ARM] S3C24XX: Split serial driver into core and per-cpu drivers")
Signed-off-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e51e4d8a

drivers/tty/serial/samsung.c

+2 −2
Original line number Diff line number Diff line
@@ -1844,8 +1844,6 @@ static int s3c24xx_serial_probe(struct platform_device *pdev) 
	ourport->min_dma_size = max_t(int, ourport->port.fifosize,

				    dma_get_cache_alignment());



	probe_index++;



	dbg("%s: initialising port %p...\n", __func__, ourport);



	ret = s3c24xx_serial_init_port(ourport, pdev);
@@ -1875,6 +1873,8 @@ static int s3c24xx_serial_probe(struct platform_device *pdev) 
	if (ret < 0)

		dev_err(&pdev->dev, "failed to add cpufreq notifier\n");



	probe_index++;



	return 0;

}