From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 841FCC433F5 for ; Tue, 17 May 2022 11:08:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344947AbiEQLIZ (ORCPT ); Tue, 17 May 2022 07:08:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48994 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344913AbiEQLIG (ORCPT ); Tue, 17 May 2022 07:08:06 -0400 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BD238AE5D; Tue, 17 May 2022 04:08:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1652785685; x=1684321685; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=3rLSxMemifcCya5x4k0dLXnkqmQGBK5a9aBX6E+21uY=; b=UUt4+BRkbxWSsok34aBghj8DiGpTDRGeC9utQb9I49TEH5Du1/ZcxRVf rypfTainHbzWUU+smztuquLn4s4qQCpmwl8KseYzuYuQEW/9goCxYVAgK +M5f2il5e0r1+f6hZGX867GQfkQV7s+m4daJpcDK5CZ+Yj9UOUqkfGqjx G6bhdSYG76JYHktjUdw8KvklEwuvYdyu6RBTrAXZb8kHKNJ/BN/eRx7qu uUbcaRKTMt0CH4oPUr1TO+u+AV4bjr+z5njfFCNCJqvPaPO4MkOOElytE 4X66kyjB34o7OnBKkonNB3lx8oZPo2KOQ/ZwqFea2w8NauaN/AEk0pswE A==; X-IronPort-AV: E=McAfee;i="6400,9594,10349"; a="271268701" X-IronPort-AV: E=Sophos;i="5.91,232,1647327600"; d="scan'208";a="271268701" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 May 2022 04:08:05 -0700 X-IronPort-AV: E=Sophos;i="5.91,232,1647327600"; d="scan'208";a="568830979" Received: from mtarral-mobl.ger.corp.intel.com (HELO ijarvine-MOBL2.ger.corp.intel.com) ([10.252.52.88]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 May 2022 04:08:01 -0700 From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= To: linux-serial@vger.kernel.org, Greg KH , Jiri Slaby , Manivannan Sadhasivam , Olof Johansson , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Arnd Bergmann , linux-arm-kernel@lists.infradead.org, linux-unisoc@lists.infradead.org, linux-kernel@vger.kernel.org Cc: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= Subject: [PATCH 3/9] serial: rda-uart: Don't allow CS5-6 Date: Tue, 17 May 2022 14:07:31 +0300 Message-Id: <20220517110737.37148-4-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220517110737.37148-1-ilpo.jarvinen@linux.intel.com> References: <20220517110737.37148-1-ilpo.jarvinen@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Only CS7 and CS8 are supported but CSIZE is not sanitized after fallthrough from CS5 or CS6 to CS7. Set CSIZE correctly so that userspace knows the effective value. Incorrect CSIZE also results in miscalculation of the frame bits in tty_get_char_size() or in its predecessor where the roughly the same code is directly within uart_update_timeout(). Cc: Manivannan Sadhasivam Fixes: c10b13325ced (tty: serial: Add RDA8810PL UART driver) Signed-off-by: Ilpo Järvinen --- drivers/tty/serial/rda-uart.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/tty/serial/rda-uart.c b/drivers/tty/serial/rda-uart.c index e5f1fded423a..f556b4955f59 100644 --- a/drivers/tty/serial/rda-uart.c +++ b/drivers/tty/serial/rda-uart.c @@ -262,6 +262,8 @@ static void rda_uart_set_termios(struct uart_port *port, fallthrough; case CS7: ctrl &= ~RDA_UART_DBITS_8; + termios->c_cflag &= ~CSIZE; + termios->c_cflag |= CS7; break; default: ctrl |= RDA_UART_DBITS_8; -- 2.30.2 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3B510C433EF for ; Tue, 17 May 2022 11:09:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=2Wdfs/Lohqvaqekf9FV1xUmAFBtFSATlf3l3O/Rv3dc=; b=SyfVXEuKFEgSOt 9RyEKj46c7LHnIjUYE8i+SD8nZRugdOOUvdjchz4FJCVPFKM4/LGw4ZyckGUlt9aQI6k9gOxvziRG tnPIOOqPZUAII+9t2NW0XRcyKrwUQctW1uN9MY5vicp040G5smZQnHmXn+42lkP1Lkb7y9kX5gk5X KG/vwzJNAd7dpb7GGsJBrMMSI/UgyiJvhIu6TZmf37cfsnoenmkzHX0oorXXEY+hYOgbeTF3mdBkW vbE0U16kvN6E3kNszV58DruxrbZNZqWPHKasIIeETlJOFyMx4V5JfG09WPd0Axh1+Twalv8xcu0Yv Xk8By5h4bBCpIim6LWFw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nqv3t-00DHWi-7S; Tue, 17 May 2022 11:08:21 +0000 Received: from mga04.intel.com ([192.55.52.120]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nqv3f-00DHOD-0D; Tue, 17 May 2022 11:08:09 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1652785686; x=1684321686; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=3rLSxMemifcCya5x4k0dLXnkqmQGBK5a9aBX6E+21uY=; b=OuA5k01erH6lb9n805GCn8wgOYj7ucLzfjwDCqokDNe41gj7f3CuxJzW zbKgCWhtHYAwllOMgrWl6Q+cGFMBGYjMLbZM1pbLzcepgbhelGr3VppFb 44EHs5p386xBVdKCbXglrtPX1XgS56Oyd5ZloQFi7ESUXJuj3zpPgjYCS ukFsAAbPsDOgkzGoTH2VhFUaxDJXeujZOSas6dCNnjVG1tipjuz7WodI5 bbURJvxqDU9tsRssZH+c4QK8kgfLdnuFQvkmePs5YwUpjkvDrWoao/C7w IlIT8+oEnmtLG6Wd0o+KkBB675Zf5NGibEUZy1TZPShOOC1TMgImizcFO A==; X-IronPort-AV: E=McAfee;i="6400,9594,10349"; a="269969393" X-IronPort-AV: E=Sophos;i="5.91,232,1647327600"; d="scan'208";a="269969393" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 May 2022 04:08:05 -0700 X-IronPort-AV: E=Sophos;i="5.91,232,1647327600"; d="scan'208";a="568830979" Received: from mtarral-mobl.ger.corp.intel.com (HELO ijarvine-MOBL2.ger.corp.intel.com) ([10.252.52.88]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 May 2022 04:08:01 -0700 From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= To: linux-serial@vger.kernel.org, Greg KH , Jiri Slaby , Manivannan Sadhasivam , Olof Johansson , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Arnd Bergmann , linux-arm-kernel@lists.infradead.org, linux-unisoc@lists.infradead.org, linux-kernel@vger.kernel.org Cc: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= Subject: [PATCH 3/9] serial: rda-uart: Don't allow CS5-6 Date: Tue, 17 May 2022 14:07:31 +0300 Message-Id: <20220517110737.37148-4-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220517110737.37148-1-ilpo.jarvinen@linux.intel.com> References: <20220517110737.37148-1-ilpo.jarvinen@linux.intel.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220517_040807_086965_93F8E987 X-CRM114-Status: UNSURE ( 8.64 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org T25seSBDUzcgYW5kIENTOCBhcmUgc3VwcG9ydGVkIGJ1dCBDU0laRSBpcyBub3Qgc2FuaXRpemVk IGFmdGVyCmZhbGx0aHJvdWdoIGZyb20gQ1M1IG9yIENTNiB0byBDUzcuCgpTZXQgQ1NJWkUgY29y cmVjdGx5IHNvIHRoYXQgdXNlcnNwYWNlIGtub3dzIHRoZSBlZmZlY3RpdmUgdmFsdWUuCkluY29y cmVjdCBDU0laRSBhbHNvIHJlc3VsdHMgaW4gbWlzY2FsY3VsYXRpb24gb2YgdGhlIGZyYW1lIGJp dHMgaW4KdHR5X2dldF9jaGFyX3NpemUoKSBvciBpbiBpdHMgcHJlZGVjZXNzb3Igd2hlcmUgdGhl IHJvdWdobHkgdGhlIHNhbWUKY29kZSBpcyBkaXJlY3RseSB3aXRoaW4gdWFydF91cGRhdGVfdGlt ZW91dCgpLgoKQ2M6IE1hbml2YW5uYW4gU2FkaGFzaXZhbSA8bWFuaUBrZXJuZWwub3JnPgpGaXhl czogYzEwYjEzMzI1Y2VkICh0dHk6IHNlcmlhbDogQWRkIFJEQTg4MTBQTCBVQVJUIGRyaXZlcikK U2lnbmVkLW9mZi1ieTogSWxwbyBKw6RydmluZW4gPGlscG8uamFydmluZW5AbGludXguaW50ZWwu Y29tPgotLS0KIGRyaXZlcnMvdHR5L3NlcmlhbC9yZGEtdWFydC5jIHwgMiArKwogMSBmaWxlIGNo YW5nZWQsIDIgaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvdHR5L3NlcmlhbC9y ZGEtdWFydC5jIGIvZHJpdmVycy90dHkvc2VyaWFsL3JkYS11YXJ0LmMKaW5kZXggZTVmMWZkZWQ0 MjNhLi5mNTU2YjQ5NTVmNTkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvdHR5L3NlcmlhbC9yZGEtdWFy dC5jCisrKyBiL2RyaXZlcnMvdHR5L3NlcmlhbC9yZGEtdWFydC5jCkBAIC0yNjIsNiArMjYyLDgg QEAgc3RhdGljIHZvaWQgcmRhX3VhcnRfc2V0X3Rlcm1pb3Moc3RydWN0IHVhcnRfcG9ydCAqcG9y dCwKIAkJZmFsbHRocm91Z2g7CiAJY2FzZSBDUzc6CiAJCWN0cmwgJj0gflJEQV9VQVJUX0RCSVRT Xzg7CisJCXRlcm1pb3MtPmNfY2ZsYWcgJj0gfkNTSVpFOworCQl0ZXJtaW9zLT5jX2NmbGFnIHw9 IENTNzsKIAkJYnJlYWs7CiAJZGVmYXVsdDoKIAkJY3RybCB8PSBSREFfVUFSVF9EQklUU184Owot LSAKMi4zMC4yCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KbGludXgtYXJtLWtlcm5lbCBtYWlsaW5nIGxpc3QKbGludXgtYXJtLWtlcm5lbEBsaXN0cy5p bmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlzdGluZm8v bGludXgtYXJtLWtlcm5lbAo=