Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp1144435iob; Wed, 4 May 2022 15:52:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzO1V191+T4DBjYPPYu9ujtpNBYGRhG/oIaSEbLsU/YHPUssRqBbS8UxMN4PC0a4Lj6KsCL X-Received: by 2002:a17:907:2d07:b0:6f4:36fe:f1c with SMTP id gs7-20020a1709072d0700b006f436fe0f1cmr18063554ejc.383.1651704776763; Wed, 04 May 2022 15:52:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651704776; cv=none; d=google.com; s=arc-20160816; b=a4hXLRHPiz6B3mYtk3jeD9rlqt1o9ZjANKBQ9XBKIHIV4MHk7ZoYwQ6W1CfVoSoQov O7iSqc58A/ZiDzqN8OpTZfHpPOCrkKbtCLpGxrIHePEUH5XfiS3RUkOrusIK2UMcnF0B c9erT91SChyRSnfyWK6bM6barH4utpd/M8aBMl5EKJSLU8Jg6ZKXyaobzJx1UC4K4Ecm FKPKU/5qnn1shkVY2mBKQp93CWTaHg6XRWtvAzahA2sXNsPXt/cdLvHKPmc2/BSLPGVc 8eYwgYrGnmxcdugc7Q9b1OXVDXWcmyOqpQYvjDj0e/dAWztXZ5/Epg6rrCJBsfXCywN/ VsKA== 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=tvct7o2K5/mlaH6F16xhpHZ3PRyOTjLTcaQPRrAvCq0=; b=iP9tvm4o96JVJz3OuLs0sTJsf70a1iDvE2VpAzEvIVXEftrjwmzSwhpiYVaQCiBXPL 7sasquYqkTRc0+EeQVOeK6ZvnThGHrfLNfc83j6P/30EcNDlI8Vc36eWbfu+PWCZ+dxi auIYqFlHxarsRw1kCWK2K1cz/m2ygqbacOR4wSK8NJKIFrZ6yeckwH5nI3/c6kk24rjh dXmJwiPTruhyg8W1MzXOGXiTCuCo4XbSO4r2R/n58IbHquAEkWyalWylOikRJRheNWAr HQAgo5tQ3O6k+rodvGWG9xIhnCR5qIFnbfmrbFrlTHLNzLDM4Enp2Oh3f8Laq1CSdvIX 5GlA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=fDpAHU4P; 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 y20-20020a50ce14000000b0041d70951197si16801119edi.530.2022.05.04.15.52.33; Wed, 04 May 2022 15:52:56 -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=fDpAHU4P; 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 S1358585AbiEDRxh (ORCPT + 99 others); Wed, 4 May 2022 13:53:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55492 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357890AbiEDRPZ (ORCPT ); Wed, 4 May 2022 13:15:25 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7220E56204; Wed, 4 May 2022 09:59:07 -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 ams.source.kernel.org (Postfix) with ESMTPS id 00F18B8279C; Wed, 4 May 2022 16:59:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A1F87C385A4; Wed, 4 May 2022 16:59:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1651683545; bh=NklaLAkdEHvnlz+bedhg6QNfkHVv0yfpygQ577M85B8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fDpAHU4P7rdgrp7FxDnQ6Kkid65Eb0mWilo1wKPjQeoJi1xj/R8u79HW8POW4Is8c pEeuLHio5u1qu7T5yXZK6vTI8bVdvqQ56x0dBGSXlDcT5A3pZQ2chDUxhXcHos2QLN ik+NuM6ZEdwradyo0aibuT2P3x9pfzhpaf9yYX+M= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Daniel Starke Subject: [PATCH 5.17 216/225] tty: n_gsm: fix reset fifo race condition Date: Wed, 4 May 2022 18:47:34 +0200 Message-Id: <20220504153129.211825265@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 73029a4d7161f8b6c0934553145ef574d2d0c645 upstream. gsmtty_write() and gsm_dlci_data_output() properly guard the fifo access. However, gsm_dlci_close() and gsmtty_flush_buffer() modifies the fifo but do not guard this. Add a guard here to prevent race conditions on parallel writes to the fifo. 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-17-daniel.starke@siemens.com Signed-off-by: Greg Kroah-Hartman --- drivers/tty/n_gsm.c | 8 ++++++++ 1 file changed, 8 insertions(+) --- a/drivers/tty/n_gsm.c +++ b/drivers/tty/n_gsm.c @@ -1442,13 +1442,17 @@ static int gsm_control_wait(struct gsm_m static void gsm_dlci_close(struct gsm_dlci *dlci) { + unsigned long flags; + del_timer(&dlci->t1); if (debug & 8) pr_debug("DLCI %d goes closed.\n", dlci->addr); dlci->state = DLCI_CLOSED; if (dlci->addr != 0) { tty_port_tty_hangup(&dlci->port, false); + spin_lock_irqsave(&dlci->lock, flags); kfifo_reset(&dlci->fifo); + spin_unlock_irqrestore(&dlci->lock, flags); /* Ensure that gsmtty_open() can return. */ tty_port_set_initialized(&dlci->port, 0); wake_up_interruptible(&dlci->port.open_wait); @@ -3148,13 +3152,17 @@ static unsigned int gsmtty_chars_in_buff static void gsmtty_flush_buffer(struct tty_struct *tty) { struct gsm_dlci *dlci = tty->driver_data; + unsigned long flags; + if (dlci->state == DLCI_CLOSED) return; /* Caution needed: If we implement reliable transport classes then the data being transmitted can't simply be junked once it has first hit the stack. Until then we can just blow it away */ + spin_lock_irqsave(&dlci->lock, flags); kfifo_reset(&dlci->fifo); + spin_unlock_irqrestore(&dlci->lock, flags); /* Need to unhook this DLCI from the transmit queue logic */ }