Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp443149iog; Mon, 13 Jun 2022 06:06:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyhb73SKIwvs7FRXsx6/tSmMPccoffJ+vzpdmaQu3CCsbMLggA6EfE2Z+j+9ykaWvznMGG+ X-Received: by 2002:aa7:8889:0:b0:51c:41b6:6e2e with SMTP id z9-20020aa78889000000b0051c41b66e2emr32693807pfe.46.1655125589293; Mon, 13 Jun 2022 06:06:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655125589; cv=none; d=google.com; s=arc-20160816; b=h0KfSS0Roi/M+iwnro27Q6aqPXDc/OBonyl9AyLIiQ6DViueR/FIFZ2M1lfJexSNmT rsFxqSsHO0nb0FPANyprQYQDsUIbtrZsrHmWO+2eI967dJ8rUEeApzH4niJ+hcBu1zYx DhPgqfKKo9wRhpAkaSybTIC97qmosrt2g0h5Y4lLzh6D+UXSqFbR0pM2VuL5sFmlAm+8 vnlZl2T/bcpv6Y1LdfXbsbzyVVypKei3yDsq9lhpIi7EXMMyYnUDi/BodsT1ZjfctRMH 6w4zv19SP0d3fH8/c5aqK4GGBw4lDkp8jzLpHqlUxESGx6oZIShr1nbca5UFNOqWXHVI a3fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=l/zlHF7MztaIsRXMdrSVh/DLlxms/Tb4+hLdJBKJh2E=; b=RzZxhQ8eW1F6qBjpnSJ6h+3HqG7h6J8ntKaprfY1NMledO/glifDLPPUp4w/MDTVeH oK6ptfkmkHMviHKBtztigNv6ZseLnBaTD4c2VOK3JYyo92kjYjmmIIlSYcRLtetxh0LC eCM8jTfGkQFjglqYtQznN/N8fCG/YXlwZLtdEiyF8gjmjtAk2Ad8JnJmZCFqpD5HiGz6 2HgDIlYRpca0De9FG87MpwHICDV4R9+V7MVZFBm5eZ7XZAesWkgNb+q8mmYpzU3dSiBt bQBsxlMIRNsMofgKyiOtmJ7L3K7Nh5OkdMOs2+QzqtWumRmX4eEHkB0iWUvDWPk/TQAQ 6fpQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=W2EKXT2V; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k126-20020a636f84000000b003995a4f48c4si11598455pgc.377.2022.06.13.06.06.05; Mon, 13 Jun 2022 06:06:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=W2EKXT2V; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245238AbiFMK1i (ORCPT + 99 others); Mon, 13 Jun 2022 06:27:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45834 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343705AbiFMKY6 (ORCPT ); Mon, 13 Jun 2022 06:24:58 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4EC3123BEB; Mon, 13 Jun 2022 03:19:25 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id DB6E760B8D; Mon, 13 Jun 2022 10:19:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E5A7AC3411C; Mon, 13 Jun 2022 10:19:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1655115564; bh=EsMgRyH2Ui3b8N69KMl1Dg6EPahzTTOTDN582z6MPe0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W2EKXT2Vz111GNO0zUJW823LX+CZ7lUhZsOv0JIIMevdVMhqSMBmSO316jtKb+I3F QSezoYT1iohTqzl6es6SeNTsK4CkqGZ1xArmJbmv30zcKVuRDbDrXgMxkwlRnAYiTw NCyNyuJCEhkKe46NFoYTCaDjo/aIZi2OfucTFfDk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Sasha Levin Subject: [PATCH 4.9 119/167] serial: sh-sci: Dont allow CS5-6 Date: Mon, 13 Jun 2022 12:09:53 +0200 Message-Id: <20220613094908.655412139@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220613094840.720778945@linuxfoundation.org> References: <20220613094840.720778945@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ilpo Järvinen [ Upstream commit 9b87162de8be26bf3156460b37deee6399fd0fcb ] Only CS7 and CS8 seem supported but CSIZE is not sanitized from CS5 or CS6 to CS8. 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: 1da177e4c3f4 (Linux-2.6.12-rc2) Signed-off-by: Ilpo Järvinen Link: https://lore.kernel.org/r/20220519081808.3776-6-ilpo.jarvinen@linux.intel.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/tty/serial/sh-sci.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c index 5c6243a31166..91c69fc3987a 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c @@ -2206,8 +2206,12 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios, unsigned long max_freq = 0; int best_clk = -1; - if ((termios->c_cflag & CSIZE) == CS7) + if ((termios->c_cflag & CSIZE) == CS7) { smr_val |= SCSMR_CHR; + } else { + termios->c_cflag &= ~CSIZE; + termios->c_cflag |= CS8; + } if (termios->c_cflag & PARENB) smr_val |= SCSMR_PE; if (termios->c_cflag & PARODD) -- 2.35.1