From patchwork Thu May 19 08:18:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ilpo_J=C3=A4rvinen?= X-Patchwork-Id: 12854647 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 607C0C433EF for ; Thu, 19 May 2022 08:21:48 +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=rCGm1XWScuFRAQ WhDQ7Fx5ddbaf6ZA+Oj2ZgvkYrLOjz9qzPgyUXRCEW1dbnrt6d0fQfEnvMBphAJ3lIIcFp2MwZKk/ S1XlWRZC3LN2UkbQYB5xR5v7jTlKpReIWzR4wNhdWiTer5Ihn+YpCLljaH8uEJGoI/GC6HaGsidXR umCSnqNexemox8flKOrU9ERzXSVjlfOAlTfw3jf+abaVVR9+yflqyj9uFFMw9tfWXtNzcBkxs3gJ+ Dq+XTMz4NXa/YJZs7qO9bR3yMJdEb9NXxVDxlooARzZOEhGnBklRavHspEzsPtd++BCHP+DYWPA3E DDYxmqzmof+e9cbho5pQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nrbOa-005m1v-QC; Thu, 19 May 2022 08:20:33 +0000 Received: from mga14.intel.com ([192.55.52.115]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nrbMm-005ki4-CK; Thu, 19 May 2022 08:18:41 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1652948320; x=1684484320; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=3rLSxMemifcCya5x4k0dLXnkqmQGBK5a9aBX6E+21uY=; b=hGiA0TnzUhmgH/+YJSGKD657GPtSbigTThBvd+y3XLvnOHkAH0UIYMV3 mFBndG4t2WouhX6B/bElTetdK0IZAW4XPiDiU/401ssJMpmUC2naaH1hU kFYrGMFmashcSHvPSv9lQowS2g6zy1NtHRoKKqGLRdHocYJl1gg5Mzief 42wspHeBEVXlYLbfJzYLtVsp0IiJM15dI30BMWfeMZMbZ1Sj3xFPZe+y4 cS8fip6PDfLrR29YbQFMf/lYzOzozaQ8oxGoOHK5BpWZFrSNkaDnlukZO ScsxgZvw2m2yuiMN3LB7fiACw/8yeB8b4nLFPp04Ak52HK6eRos+09ul2 Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10351"; a="272218918" X-IronPort-AV: E=Sophos;i="5.91,237,1647327600"; d="scan'208";a="272218918" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 May 2022 01:18:30 -0700 X-IronPort-AV: E=Sophos;i="5.91,237,1647327600"; d="scan'208";a="598431246" Received: from ivanovbx-mobl1.ger.corp.intel.com (HELO ijarvine-MOBL2.ger.corp.intel.com) ([10.249.33.234]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 May 2022 01:18:26 -0700 From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= To: linux-serial@vger.kernel.org, Greg KH , Jiri Slaby , Shubhrajyoti Datta , Manivannan Sadhasivam , =?utf-8?q?Andreas_F=C3=A4rber?= , Olof Johansson , Arnd Bergmann , linux-arm-kernel@lists.infradead.org, linux-unisoc@lists.infradead.org, linux-kernel@vger.kernel.org Cc: =?utf-8?q?Ilpo_J=C3=A4rvinen?= Subject: [PATCH v2 3/9] serial: rda-uart: Don't allow CS5-6 Date: Thu, 19 May 2022 11:18:02 +0300 Message-Id: <20220519081808.3776-4-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220519081808.3776-1-ilpo.jarvinen@linux.intel.com> References: <20220519081808.3776-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-20220519_011840_534214_B8A2FA45 X-CRM114-Status: UNSURE ( 8.91 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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;