diff options
| author | Max Filippov <jcmvbkbc@gmail.com> | 2016-02-09 01:02:38 +0300 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-04-18 08:50:54 -0400 |
| commit | 1ef6e487322a28195a9e68bd376944b7ec6db6c2 (patch) | |
| tree | 1b6124ab14245f6e1811a9437857d928dfd0210e /arch | |
| parent | a14fea4d0284643ffd8538d2204cfb1fa8ac804d (diff) | |
| download | lwn-1ef6e487322a28195a9e68bd376944b7ec6db6c2.tar.gz lwn-1ef6e487322a28195a9e68bd376944b7ec6db6c2.zip | |
xtensa: ISS: don't hang if stdin EOF is reached
[ Upstream commit 362014c8d9d51d504c167c44ac280169457732be ]
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>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/xtensa/platforms/iss/console.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/xtensa/platforms/iss/console.c b/arch/xtensa/platforms/iss/console.c index 70cb408bc20d..92d785fefb6d 100644 --- a/arch/xtensa/platforms/iss/console.c +++ b/arch/xtensa/platforms/iss/console.c @@ -100,21 +100,23 @@ static void rs_poll(unsigned long priv) { struct tty_port *port = (struct tty_port *)priv; int i = 0; + int rd = 1; unsigned char c; spin_lock(&timer_lock); 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); i++; } if (i) tty_flip_buffer_push(port); - - - mod_timer(&serial_timer, jiffies + SERIAL_TIMER_VALUE); + if (rd) + mod_timer(&serial_timer, jiffies + SERIAL_TIMER_VALUE); spin_unlock(&timer_lock); } |