Eric Lee / smarc-ti-linux-kernel

2
Download as
Browse Code ยป

Commit 79fbf4a550ed6a22e1ae1516113e6c7fa5d56a53

Authored by Johan Hovold
Committed by Greg Kroah-Hartman
1 parent f528bf4f57
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

TTY: fix tty_wait_until_sent on 64-bit machines 

Fix overflow bug in tty_wait_until_sent on 64-bit machines, where an
infinite timeout (0) would be passed to the underlying tty-driver's
wait_until_sent-operation as a negative timeout (-1), causing it to
return immediately.

This manifests itself for example as tcdrain() returning immediately,
drivers not honouring the drain flags when setting terminal attributes,
or even dropped data on close as a requested infinite closing-wait
timeout would be ignored.

The first symptom  was reported by Asier LLANO who noted that tcdrain()
returned prematurely when using the ftdi_sio usb-serial driver.

Fix this by passing 0 rather than MAX_SCHEDULE_TIMEOUT (LONG_MAX) to the
underlying tty driver.

Note that the serial-core wait_until_sent-implementation is not affected
by this bug due to a lucky chance (comparison to an unsigned maximum
timeout), and neither is the cyclades one that had an explicit check for
negative timeouts, but all other tty drivers appear to be affected.

Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Cc: stable <stable@vger.kernel.org>	# v2.6.12
Reported-by: ZIV-Asier Llano Palacios <asier.llano@cgglobal.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
Reviewed-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 1 changed file with 9 additions and 3 deletions Side-by-side Diff

drivers/tty/tty_ioctl.c
Diff comments   View file @ 79fbf4a
... ... @@ -217,11 +217,17 @@
217 217 #endif
218 218 if (!timeout)
219 219 timeout = MAX_SCHEDULE_TIMEOUT;
  220 +
220 221 if (wait_event_interruptible_timeout(tty->write_wait,
221   - !tty_chars_in_buffer(tty), timeout) >= 0) {
222   - if (tty->ops->wait_until_sent)
223   - tty->ops->wait_until_sent(tty, timeout);
  222 + !tty_chars_in_buffer(tty), timeout) < 0) {
  223 + return;
224 224 }
  225 +
  226 + if (timeout == MAX_SCHEDULE_TIMEOUT)
  227 + timeout = 0;
  228 +
  229 + if (tty->ops->wait_until_sent)
  230 + tty->ops->wait_until_sent(tty, timeout);
225 231 }
226 232 EXPORT_SYMBOL(tty_wait_until_sent);
227 233