Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-22 10:56:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

serial: sh-sci: Fix crash in rx_timer_fn() on PIO fallback

Browse Source 
When falling back to PIO, active_rx must be set to a different value
than cookie_rx[i], else sci_dma_rx_find_active() will incorrectly find a
match, leading to a NULL pointer dereference in rx_timer_fn() later.

Use zero instead, which is the same value as after driver
initialization.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Geert Uytterhoeven 2018-12-13 19:44:42 +01:00 committed by Greg Kroah-Hartman
parent dd1f2250da
commit 2e948218b7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/tty/serial/sh-sci.c
View File

@ -1369,7 +1369,7 @@ fail:
dmaengine_terminate_async(chan); dmaengine_terminate_async(chan);
for (i = 0; i < 2; i++) for (i = 0; i < 2; i++)
s->cookie_rx[i] = -EINVAL; s->cookie_rx[i] = -EINVAL;
s->active_rx = -EINVAL; s->active_rx = 0;
s->chan_rx = NULL; s->chan_rx = NULL;
sci_start_rx(port); sci_start_rx(port);
if (!port_lock_held) if (!port_lock_held)