From patchwork Thu May 19 08:18:01 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: 12854646 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 54304C433F5 for ; Thu, 19 May 2022 08:21:47 +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=kB2uxf4K2gfi7p+ah44xmU1onTBrXeYvZ+L1c746fMM=; b=06MF+gtTWt7kmy dNz+/u04UoiluBawWMxrkNHinMxTXKOOsVApRqgtB6WvO1gsex9VYHWBu1NpdXspHpQVzs7UolvDn UoO5CVtl8WBOyriFAwP7P5ATE3PUqL0zbGJ7yMRAdhVSFuW0E3/OprSfQUv0LKlBSulMDTsX1OBCc QRFtZVLKu1spzTwRCdLTm1CYSotHEf6eknLAtKe4YdPjOrISg9A+DwREAnJ9q5/2PCvFINKDurTSW aKd8TslT3Ke8fpyhq+GtsvXQwvq8md41/328hygwl8MUKmIxxwI5lDKJNaQB16T4DD+ctn88RKd2g vVL5ZeaaD8+0oCQOzq+g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nrbOG-005lpD-NE; Thu, 19 May 2022 08:20:13 +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-005kf3-0m for linux-arm-kernel@lists.infradead.org; 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=b9Axn5x53cq5qpRqup5YgCPJ4p1ak9lGTGlntS2e76c=; b=cn8ZIJVpuCsl1nXyL/LWzP6lLmKROdUp0gGshEr32cuUJf62Zjz2OaQO 29o5ZIYQbkYMtGGwTumWEqw65+RSIfcMjg75X88SkIuFbcqaqu20FkNs7 SQpCNZoSNLjmHTCrHyxs1RNaztOXXhI+spNtHzoG0HMXGOwq6LXkFAJpa NLXfGemYQBjJftgZSCvCWlRS6emJkKAzZd/57v1eSyj9n+EEbjYWXfgaF snQXs7sWgHg8F4yrrMR5s47U4FJW2eSUXq+2QpF71zLZi9xSi9o1NUrKA zoYFksSyDQZ5Zp0UTosESaVohAB8OgJncwoVcw/0PCI6NiFX8oR0qbzVP Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10351"; a="272218889" X-IronPort-AV: E=Sophos;i="5.91,237,1647327600"; d="scan'208";a="272218889" 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:27 -0700 X-IronPort-AV: E=Sophos;i="5.91,237,1647327600"; d="scan'208";a="598431203" 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:23 -0700 From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= To: linux-serial@vger.kernel.org, Greg KH , Jiri Slaby , Shubhrajyoti Datta , Baruch Siach , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: =?utf-8?q?Ilpo_J=C3=A4rvinen?= Subject: [PATCH v2 2/9] serial: digicolor-usart: Don't allow CS5-6 Date: Thu, 19 May 2022 11:18:01 +0300 Message-Id: <20220519081808.3776-3-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_106916_C07B0FFC X-CRM114-Status: UNSURE ( 9.95 ) 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 seem supported but CSIZE is not sanitized to CS8 in the default: block. 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(). Fixes: 5930cb3511df (serial: driver for Conexant Digicolor USART) Acked-by: Baruch Siach Signed-off-by: Ilpo Järvinen --- drivers/tty/serial/digicolor-usart.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/tty/serial/digicolor-usart.c b/drivers/tty/serial/digicolor-usart.c index 6d70fea76bb3..65e653eb5026 100644 --- a/drivers/tty/serial/digicolor-usart.c +++ b/drivers/tty/serial/digicolor-usart.c @@ -309,6 +309,8 @@ static void digicolor_uart_set_termios(struct uart_port *port, case CS8: default: config |= UA_CONFIG_CHAR_LEN; + termios->c_cflag &= ~CSIZE; + termios->c_cflag |= CS8; break; }