Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp4804570iob; Mon, 9 May 2022 01:56:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzEp7+NR7aeHKr3azMlnEU52000V5VOyMfHLIUlbmoQwDCx7gyrsCYRZxQG4mgiqFIPZ+XH X-Received: by 2002:a17:902:ec8c:b0:15e:a371:ad7d with SMTP id x12-20020a170902ec8c00b0015ea371ad7dmr15238191plg.12.1652086609448; Mon, 09 May 2022 01:56:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652086609; cv=none; d=google.com; s=arc-20160816; b=Xwn6utgPSWzwWOLDv+xmkEDTQ/bpd+rro6CQn0qTk2oAA4jSTn1P8jE4SC9EtXNAmd uipD/6YkPPB6QVRzFSm+KMWQ7aXRM+sUTFjZ46DWJKxWtAbKePSSew3kTgsiDOTIdqCt 61x416IymVHA9uCxc5tInX5/zxTwIxi16bK0NpwdIxfB+e75wh5nV8YiiLQ0PmACkEL/ JZtnTuPz90tBhwD06soFpBulJPz4UUjSY63MuPujfB1Ypc+OCwXI1jgFVToa4tiGqiNd pmwS4gJ+pqgk4tzqPvzXsAv52+ep8C+L1SIARhqKWarhWYUsyYTTQnRvMUdsksNHm8GJ ShDA== 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=n4CeQi8Ac4NvfWba7yEUfHCQJwQ2lEEGPMtdw5PppJc=; b=LotenDBxKexnRQpy179h7erpYKp9UHSwyCGBGtiqC/Nuvhui5ozpvMkxWLzwY/am3Y qwaX6bvcCT5lGfK7OjzXO7q6W34DVQRXnhsH0l1puJ2QS+cWOw7KsPqrT2FoBryvo/Zw k7SvIK/afeP87aLHqGeSd8GDoYtnLSWmaDEINmeycpxgh2fiG7P5AR++eY2Y5OpxHaPB RDJM5yJuF5QzUItoc8/VWNOeY24K+Ra/TLCoQhIlnLIjuuEJkOuKF6VAmHVj5Ol+ULNS jf5Qn/an2ThOHbh46AcTr3pi6oow1vBEQ50VWkTNXfkYsPCSV95r7cwOI5qIZHYmf+XY N02A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=dHIaQzqa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 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 lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id e23-20020a63d957000000b003aa63a39ba9si1141747pgj.193.2022.05.09.01.56.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 May 2022 01:56:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=dHIaQzqa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 90287149DB7; Mon, 9 May 2022 01:41:59 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1359426AbiEDRxZ (ORCPT + 99 others); Wed, 4 May 2022 13:53:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55350 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357980AbiEDRPe (ORCPT ); Wed, 4 May 2022 13:15:34 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 753A456231; Wed, 4 May 2022 09:59:12 -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 56B2C6179D; Wed, 4 May 2022 16:59:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A8229C385B0; Wed, 4 May 2022 16:59:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1651683551; bh=SukELfx7VYH3zBnpDxPY7eodkgYAyAGIELgmaM+bAN4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dHIaQzqaMzpaT2PCiwT+wZ1Ohizs0qPtfEN/ZeIuJ/p2fIAJ+7E5EcPYqlpAHRORH QoEu5/FosRBzFrw6+flMVteJ5smw6TGT6TXXoBq8BZLRQ88/rNMgZ1iPQ5ZiMZ8XML OIdam6/O3Z3CWPGMVZn4Hj96iYXFbyvW6FuLZQjo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Daniel Starke Subject: [PATCH 5.17 205/225] tty: n_gsm: fix wrong signal octet encoding in convergence layer type 2 Date: Wed, 4 May 2022 18:47:23 +0200 Message-Id: <20220504153128.393373915@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=-2.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable 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 06d5afd4d640eea67f5623e76cd5fc03359b7f3c upstream. n_gsm is based on the 3GPP 07.010 and its newer version is the 3GPP 27.010. See https://portal.3gpp.org/desktopmodules/Specifications/SpecificationDetails.aspx?specificationId=1516 The changes from 07.010 to 27.010 are non-functional. Therefore, I refer to the newer 27.010 here. Chapter 5.5.2 describes that the signal octet in convergence layer type 2 can be either one or two bytes. The length is encoded in the EA bit. This is set 1 for the last byte in the sequence. gsmtty_modem_update() handles this correctly but gsm_dlci_data_output() fails to set EA to 1. There is no case in which we encode two signal octets as there is no case in which we send out a break signal. Therefore, always set the EA bit to 1 for the signal octet to fix this. 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-5-daniel.starke@siemens.com Signed-off-by: Greg Kroah-Hartman --- drivers/tty/n_gsm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/tty/n_gsm.c +++ b/drivers/tty/n_gsm.c @@ -832,7 +832,7 @@ static int gsm_dlci_data_output(struct g break; case 2: /* Unstructed with modem bits. Always one byte as we never send inline break data */ - *dp++ = gsm_encode_modem(dlci); + *dp++ = (gsm_encode_modem(dlci) << 1) | EA; break; } WARN_ON(kfifo_out_locked(&dlci->fifo, dp , len, &dlci->lock) != len);