Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp1025046iob; Wed, 4 May 2022 12:59:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxg++C+NifmyCMneJNoMSEHhosmLND9f5tQzs+C9fUKAr85FVlVINoTkUjYdLbu/BxRgRRL X-Received: by 2002:a17:906:7948:b0:6da:64ed:178e with SMTP id l8-20020a170906794800b006da64ed178emr22488824ejo.523.1651694368505; Wed, 04 May 2022 12:59:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651694368; cv=none; d=google.com; s=arc-20160816; b=K5VvYzB15miZ5WD7q0UirpJd7QCpCWibbuD/3rMPGVEH54Uu6WgoAk7NGgLw9mNh1Q M+R9H325UWQZ34AclZEO/sgDn2T7p0+1pk5JnLXxywg41RWfNhTWlFriyggOErg4ru8I Dz6k6G/HlspMmjYtiCXD0r8qUWx0AG7jyhCG3/iOUwqV+j8j62jPblJ97KIMYGWalY09 +PNoOZLZts47f7PT8KQzKd66t4eOqkGAdaPeHeRkMzvYBxNuRhdclXSkBQmC6x8lMpSo 90ShXSzoLhXuSqeOusZxtckYEP/Fm87mTeOXXvpd40V/PzaPvqd5kz4sB22SEo2NupZP fyBA== 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=E63jh3zXALX2agZBzvbRCNqRykmZryfdMaX6QsFGB5c=; b=m6qmwonsATOttSnCaEDbPRleOALVTeiONV/unhz4mnCnX+ye91qsEOUxyCZfq3PzWT kF8HeUNt5DIIJbv0ny/Yir7Njn/l6qgqaKXswm0WCa/fnJ0PCP1SzH1wGKhzcMVeLwSY P2Qu16cMsOkhxJyDUXEZAXU29yRS7X4BCAAAEeRtUN7RLmShPMtfG9HCnx86LCsurpuo F+algN77vxcXMIECFNiER8KDpqPeE+FydmlIZfhjo2QUuY59V3wbduApTtldqF9ajd/s hNhhSmPm9im8o+rdg8JrQBF1GQ82BIMYp+fJgV7S5Odp8UIaEUTQt7MhxC7kCmvSAByT McSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=vEHuEYfv; 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 ju6-20020a17090798a600b006f4b5f578c7si2739642ejc.867.2022.05.04.12.59.04; Wed, 04 May 2022 12:59:28 -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=vEHuEYfv; 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 S1376303AbiEDRuW (ORCPT + 99 others); Wed, 4 May 2022 13:50:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55406 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357995AbiEDRPf (ORCPT ); Wed, 4 May 2022 13:15:35 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7DE3B562CD; Wed, 4 May 2022 09:59:14 -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 5D3AA6191D; Wed, 4 May 2022 16:59:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A8C37C385B1; Wed, 4 May 2022 16:59:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1651683553; bh=XiXrLYDPNASD3Kn+XxkAPbrXD+joPr+uqv+/z8Ul8pk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vEHuEYfvruqlMTBrmxqBOxC4RIubn4tMdBb+HNXlwLzBFMCd6VN8DIZ/RHsEJ0/Xs pL6kDHWSB6W249c+P8aZIPk2c4htls7w4CoagsOoHqL3LWPf8SoepjWu6ffvEVOCeG D1/6r20rLijE2AyBG5HiMZbLWeKc9RMYre/pfQF8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Daniel Starke Subject: [PATCH 5.17 207/225] tty: n_gsm: fix malformed counter for out of frame data Date: Wed, 4 May 2022 18:47:25 +0200 Message-Id: <20220504153128.541649848@linuxfoundation.org> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220504153110.096069935@linuxfoundation.org> References: <20220504153110.096069935@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=-7.7 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: Daniel Starke commit a24b4b2f660b7ddf3f484b37600bba382cb28a9d upstream. The gsm_mux field 'malformed' represents the number of malformed frames received. However, gsm1_receive() also increases this counter for any out of frame byte. Fix this by ignoring out of frame data for the malformed counter. Fixes: e1eaea46bb40 ("tty: n_gsm line discipline") Cc: stable@vger.kernel.org Signed-off-by: Daniel Starke Link: https://lore.kernel.org/r/20220414094225.4527-7-daniel.starke@siemens.com Signed-off-by: Greg Kroah-Hartman --- drivers/tty/n_gsm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/tty/n_gsm.c +++ b/drivers/tty/n_gsm.c @@ -2044,7 +2044,8 @@ static void gsm1_receive(struct gsm_mux } /* Any partial frame was a runt so go back to start */ if (gsm->state != GSM_START) { - gsm->malformed++; + if (gsm->state != GSM_SEARCH) + gsm->malformed++; gsm->state = GSM_START; } /* A SOF in GSM_START means we are still reading idling or