UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

xtensa: ISS: don't hang if stdin EOF is reached 

Simulator stdin may be connected to a file, when its end is reached
kernel hangs in infinite loop inside rs_poll, because simc_poll always
signals that descriptor 0 is readable and simc_read always returns 0.
Check simc_read return value and exit loop if it's not positive. Also
don't rewind polling timer if it's zero.

Cc: stable@vger.kernel.org
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
This commit is contained in:
Max Filippov 2016-02-09 01:02:38 +03:00 committed by Chris Zankel
parent bb2f348604
commit 362014c8d9
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/xtensa/platforms/iss/console.c
View File

@ -100,21 +100,23 @@ static void rs_poll(unsigned long priv)
{ {
struct tty_port *port = (struct tty_port *)priv; struct tty_port *port = (struct tty_port *)priv;
int i = 0; int i = 0;
int rd = 1;
unsigned char c; unsigned char c;
spin_lock(&timer_lock); spin_lock(&timer_lock);
while (simc_poll(0)) { while (simc_poll(0)) {
simc_read(0, &c, 1); rd = simc_read(0, &c, 1);
if (rd <= 0)
break;
tty_insert_flip_char(port, c, TTY_NORMAL); tty_insert_flip_char(port, c, TTY_NORMAL);
i++; i++;
} }
if (i) if (i)
tty_flip_buffer_push(port); tty_flip_buffer_push(port);
if (rd)
mod_timer(&serial_timer, jiffies + SERIAL_TIMER_VALUE);
mod_timer(&serial_timer, jiffies + SERIAL_TIMER_VALUE);
spin_unlock(&timer_lock); spin_unlock(&timer_lock);
} }