linux-kernel - [PATCH v2 12/14] USB: ch341: improve B0 handling

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <1459616843-23829-13-git-send-email-greg@chown.ath.cx>
Date:	Sat,  2 Apr 2016 19:07:21 +0200
From:	Grigori Goronzy <greg@...wn.ath.cx>
To:	Johan Hovold <johan@...nel.org>
Cc:	Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
	linux-usb@...r.kernel.org, linux-kernel@...r.kernel.org,
	Grigori Goronzy <greg@...wn.ath.cx>
Subject: [PATCH v2 12/14] USB: ch341: improve B0 handling

Check for B0 in a more idiomatic way and make sure to not enable
RTS/CTS hardware flow control in B0 as it may override the control
lines.  Also make sure to only enable RTS/DTR if there's a transition
from B0.

Signed-off-by: Grigori Goronzy <greg@...wn.ath.cx>
---
 drivers/usb/serial/ch341.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c
index ba654e1..3b9a43d 100644
--- a/drivers/usb/serial/ch341.c
+++ b/drivers/usb/serial/ch341.c
@@ -396,10 +396,12 @@ static void ch341_set_termios(struct tty_struct *tty,
 	if (cflag & CSTOPB)
 		ctrl |= CH341_LCR_STOP_BITS_2;
 
-	if (baud_rate) {
-		spin_lock_irqsave(&priv->lock, flags);
-		priv->line_control |= (CH341_BIT_DTR | CH341_BIT_RTS);
-		spin_unlock_irqrestore(&priv->lock, flags);
+	if ((cflag & CBAUD) != B0) {
+		if (old_termios && (old_termios->c_cflag & CBAUD) == B0) {
+			spin_lock_irqsave(&priv->lock, flags);
+			priv->line_control |= (CH341_BIT_DTR | CH341_BIT_RTS);
+			spin_unlock_irqrestore(&priv->lock, flags);
+		}
 		r = ch341_init_set_baudrate(port->serial->dev, priv, ctrl);
 		if (r < 0)
 			priv->baud_rate = tty_termios_baud_rate(old_termios);
@@ -411,7 +413,7 @@ static void ch341_set_termios(struct tty_struct *tty,
 
 	ch341_set_handshake(port->serial->dev, priv->line_control);
 
-	if (cflag & CRTSCTS) {
+	if ((cflag & CRTSCTS) && ((cflag & CBAUD) != B0)) {
 		r = ch341_control_out(port->serial->dev, CH341_REQ_WRITE_REG,
 				CH341_REG_RTSCTS | ((uint16_t)CH341_REG_RTSCTS << 8),
 				0x0101);
-- 
1.9.1