mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Greg KH <gregkh@suse.de>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: torvalds@linux-foundation.org, akpm@linux-foundation.org,
	alan@lxorguk.ukuu.org.uk, Andrew Worsley <amworsley@gmail.com>
Subject: [41/53] USB: Fix Corruption issue in USB ftdi driver ftdi_sio.c
Date: Tue, 22 Nov 2011 16:25:41 -0800	[thread overview]
Message-ID: <20111123002556.755840884@clark.kroah.org> (raw)
In-Reply-To: <20111123002601.GA14467@kroah.com>

3.1-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Andrew Worsley <amworsley@gmail.com>

commit b1ffb4c851f185e9051ba837c16d9b84ef688d26 upstream.

Fix for ftdi_set_termios() glitching output

ftdi_set_termios() is constantly setting the baud rate, data bits and parity
unnecessarily on every call, . When called while characters are being
transmitted can cause the FTDI chip to corrupt the serial port bit stream
output by stalling the output half a bit during the output of a character.
Simple fix by skipping this setting if the baud rate/data bits/parity are
unchanged.

Signed-off-by: Andrew Worsley <amworsley@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
 drivers/usb/serial/ftdi_sio.c |   14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -2083,13 +2083,19 @@ static void ftdi_set_termios(struct tty_
 
 	cflag = termios->c_cflag;
 
-	/* FIXME -For this cut I don't care if the line is really changing or
-	   not  - so just do the change regardless  - should be able to
-	   compare old_termios and tty->termios */
+	if (old_termios->c_cflag == termios->c_cflag
+	    && old_termios->c_ispeed == termios->c_ispeed
+	    && old_termios->c_ospeed == termios->c_ospeed)
+		goto no_c_cflag_changes;
+
 	/* NOTE These routines can get interrupted by
 	   ftdi_sio_read_bulk_callback  - need to examine what this means -
 	   don't see any problems yet */
 
+	if ((old_termios->c_cflag & (CSIZE|PARODD|PARENB|CMSPAR|CSTOPB)) ==
+	    (termios->c_cflag & (CSIZE|PARODD|PARENB|CMSPAR|CSTOPB)))
+		goto no_data_parity_stop_changes;
+
 	/* Set number of data bits, parity, stop bits */
 
 	urb_value = 0;
@@ -2130,6 +2136,7 @@ static void ftdi_set_termios(struct tty_
 	}
 
 	/* Now do the baudrate */
+no_data_parity_stop_changes:
 	if ((cflag & CBAUD) == B0) {
 		/* Disable flow control */
 		if (usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
@@ -2157,6 +2164,7 @@ static void ftdi_set_termios(struct tty_
 
 	/* Set flow control */
 	/* Note device also supports DTR/CD (ugh) and Xon/Xoff in hardware */
+no_c_cflag_changes:
 	if (cflag & CRTSCTS) {
 		dbg("%s Setting to CRTSCTS flow control", __func__);
 		if (usb_control_msg(dev,



  parent reply	other threads:[~2011-11-23  0:36 UTC|newest]

Thread overview: 54+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-23  0:26 [00/53] 3.1.3-stable review Greg KH
2011-11-23  0:25 ` [01/53] genirq: Fix irqfixup, irqpoll regression Greg KH
2011-11-23  0:25 ` [02/53] ALSA: hda - Fix the connection selection of ADCs on Cirrus codecs Greg KH
2011-11-23  0:25 ` [03/53] [SCSI] fix WARNING: at drivers/scsi/scsi_lib.c:1704 Greg KH
2011-11-23  0:25 ` [04/53] [SCSI] hpsa: Disable ASPM Greg KH
2011-11-23  0:25 ` [05/53] [SCSI] aacraid: controller hangs if kernel uses non-default ASPM policy Greg KH
2011-11-23  0:25 ` [06/53] [media] saa7164: Add support for another HVR2200 hardware revision Greg KH
2011-11-23  0:25 ` [07/53] KVM: s390: Fix RUNNING flag misinterpretation Greg KH
2011-11-23  0:25 ` [08/53] ARM: 7150/1: Allow kernel unaligned accesses on ARMv6+ Greg KH
2011-11-23  0:25 ` [09/53] Net, libertas: Resolve memory leak in if_spi_host_to_card() Greg KH
2011-11-23  0:25 ` [10/53] rt2x00: Fix sleep-while-atomic bug in powersaving code Greg KH
2011-11-23  0:25 ` [11/53] mac80211: fix NULL dereference in radiotap code Greg KH
2011-11-23  0:25 ` [12/53] mac80211: fix bug in ieee80211_build_probe_req Greg KH
2011-11-23  0:25 ` [13/53] nl80211: fix HT capability attribute validation Greg KH
2011-11-23  0:25 ` [14/53] cfg80211: fix bug on regulatory core exit on access to last_request Greg KH
2011-11-23  0:25 ` [15/53] ip6_tunnel: copy parms.name after register_netdevice Greg KH
2011-11-23  0:25 ` [16/53] PM / driver core: disable devices runtime PM during shutdown Greg KH
2011-11-23  0:25 ` [17/53] pch_phub: Support new device LAPIS Semiconductor ML7831 IOH Greg KH
2011-11-23  0:25 ` [18/53] pch_phub: Fix MAC address writing issue for LAPIS ML7831 Greg KH
2011-11-23  0:25 ` [19/53] pch_uart: Fix hw-flow control issue Greg KH
2011-11-23  0:25 ` [20/53] pch_uart: Fix DMA resource leak issue Greg KH
2011-11-23  0:25 ` [21/53] pch_uart: Support new device LAPIS Semiconductor ML7831 IOH Greg KH
2011-11-23  0:25 ` [22/53] tty: hvc_dcc: Fix duplicate character inputs Greg KH
2011-11-23  0:25 ` [23/53] TTY: ldisc, allow waiting for ldisc arbitrarily long Greg KH
2011-11-23  0:25 ` [24/53] TTY: ldisc, move wait idle to caller Greg KH
2011-11-23  0:25 ` [25/53] TTY: ldisc, wait for ldisc infinitely in hangup Greg KH
2011-11-23  0:25 ` [26/53] nfs: when attempting to open a directory, fall back on normal lookup (try #5) Greg KH
2011-11-23  0:25 ` [27/53] ALSA: hda - fix ELD memory leak Greg KH
2011-11-23  0:25 ` [28/53] pcie-gadget-spear: Add "platform:" prefix for platform modalias Greg KH
2011-11-23  0:25 ` [29/53] drivers/base/node.c: fix compilation error with older versions of gcc Greg KH
2011-11-23  0:25 ` [30/53] xhci: Set slot and ep0 flags for address command Greg KH
2011-11-23  0:25 ` [31/53] usb, xhci: Clear warm reset change event during init Greg KH
2011-11-23  0:25 ` [32/53] usb, xhci: fix lockdep warning on endpoint timeout Greg KH
2011-11-23  0:25 ` [33/53] USB: XHCI: resume root hubs when the controller resumes Greg KH
2011-11-23  0:25 ` [34/53] USB: option: release new PID for ZTE 3G modem Greg KH
2011-11-23  0:25 ` [35/53] USB: option: add PID of Huawei E173s " Greg KH
2011-11-23  0:25 ` [36/53] USB: serial: pl2303: rm duplicate id Greg KH
2011-11-23  0:25 ` [37/53] USB: pch_udc: Support new device LAPIS Semiconductor ML7831 IOH Greg KH
2011-11-23  0:25 ` [38/53] USB: cdc-acm: Fix disconnect() vs close() race Greg KH
2011-11-23  0:25 ` [39/53] USB: workaround for bug in old version of GCC Greg KH
2011-11-23  0:25 ` [40/53] USB: ark3116 initialisation fix Greg KH
2011-11-23  0:25 ` Greg KH [this message]
2011-11-23  0:25 ` [42/53] usb-storage: Accept 8020i-protocol commands longer than 12 bytes Greg KH
2011-11-23  0:25 ` [43/53] USB: EHCI: fix HUB TT scheduling issue with iso transfer Greg KH
2011-11-23  0:25 ` [44/53] USB: add quirk for Logitech C600 web cam Greg KH
2011-11-23  0:25 ` [45/53] USB: quirks: adding more quirky webcams to avoid squeaky audio Greg KH
2011-11-23  0:25 ` [46/53] drm/i915: fix IVB cursor support Greg KH
2011-11-23  0:25 ` [47/53] drm/i915: always set FDI composite sync bit Greg KH
2011-11-23  0:25 ` [48/53] batman-adv: fix tt_local_reset_flags() function Greg KH
2011-11-23  0:25 ` [49/53] batman-adv: correctly set the data field in the TT_REPONSE packet Greg KH
2011-11-23  0:25 ` [50/53] batman-adv: remove references for global tt entries Greg KH
2011-11-23  0:25 ` [51/53] batman-adv: add sanity check when removing global tts Greg KH
2011-11-23  0:25 ` [52/53] batman-adv: unify hash_entry field position in tt_local/global_entry Greg KH
2011-11-23  0:25 ` [53/53] vmscan: fix shrinker callback bug in fs/super.c Greg KH

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20111123002556.755840884@clark.kroah.org \
    --to=gregkh@suse.de \
    --cc=akpm@linux-foundation.org \
    --cc=alan@lxorguk.ukuu.org.uk \
    --cc=amworsley@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®