From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf0-f68.google.com ([209.85.215.68]:35891 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932839AbcKGSZa (ORCPT ); Mon, 7 Nov 2016 13:25:30 -0500 Received: by mail-lf0-f68.google.com with SMTP id o20so9561382lfg.3 for ; Mon, 07 Nov 2016 10:25:29 -0800 (PST) From: Johan Hovold To: Greg Kroah-Hartman Cc: stable@vger.kernel.org, Johan Hovold Subject: [PATCH stable-4.4] USB: serial: cp210x: fix tiocmget error handling Date: Mon, 7 Nov 2016 19:24:52 +0100 Message-Id: <1478543092-1298-1-git-send-email-johan@kernel.org> In-Reply-To: <147853744699138@kroah.com> References: <147853744699138@kroah.com> Sender: stable-owner@vger.kernel.org List-ID: commit de24e0a108bc48062e1c7acaa97014bce32a919f upstream. The current tiocmget implementation would fail to report errors up the stack and instead leaked a few bits from the stack as a mask of modem-status flags. Fixes: 39a66b8d22a3 ("[PATCH] USB: CP2101 Add support for flow control") Signed-off-by: Johan Hovold --- Here's a backport of de24e0a108bc ("USB: serial: cp210x: fix tiocmget error handling") to 4.4. Johan drivers/usb/serial/cp210x.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c index 6eccded3bc33..976195e748a3 100644 --- a/drivers/usb/serial/cp210x.c +++ b/drivers/usb/serial/cp210x.c @@ -845,7 +845,9 @@ static int cp210x_tiocmget(struct tty_struct *tty) unsigned int control; int result; - cp210x_get_config(port, CP210X_GET_MDMSTS, &control, 1); + result = cp210x_get_config(port, CP210X_GET_MDMSTS, &control, 1); + if (result) + return result; result = ((control & CONTROL_DTR) ? TIOCM_DTR : 0) |((control & CONTROL_RTS) ? TIOCM_RTS : 0) -- 2.7.3