From patchwork Sat Nov 5 06:00:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 15897 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp829300wru; Fri, 4 Nov 2022 23:03:22 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5j90h8gZkIhdWciYDKFQXw45hQM0p1uRJ/LPijBmkZWYONvZneH4U+S1fVKeQiv4uGJxIM X-Received: by 2002:a17:902:e801:b0:187:3a52:d24f with SMTP id u1-20020a170902e80100b001873a52d24fmr22348771plg.127.1667628201807; Fri, 04 Nov 2022 23:03:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667628201; cv=none; d=google.com; s=arc-20160816; b=D1nH69p9tVk8swXQrkT25cwNgYbB93VbtsUA3dqIkMlz1b5tY0l9lL7DT6T9R0YC/m xVs50rIiMoUHzBQyvXMnz+j/4vHWyamT1H/vs6J56owsvf/eYl19jSKHaTs963dRriNr jz2LG0Rbzr6FNAVS2a1j9h5EKIVphOJCxLGwApJhTZlmCrC7NUOixa1d4mRe60bkrUuR hRNBPZ4g7KRmgRkomXeECTqOuloGvKv2qURMdaV6nzYYXNeQxRw7w+Pc95+GF37mo54Q zRrHiNUdFGiPb+gDbvgd7SftrYfo8LY0iXwq3Y++hUi5ERQIGu0wIQuEyJMm6hhD3mKH IPqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:subject:cc:to:from:date :user-agent:message-id; bh=pTpzDqYxacP8Wvh//SjtjgikmkifjC22iZtfg2dOxQI=; b=idKBMtyH9cMNBH7ltkcGkgxgiBkWdsDWfI7jMaslk1sPaatn2IyZTCoq4BrqJ2HTV5 v+NQ5ia4APD9boQexnmTdTggt18mwqSbaL0cSGivg4JoxRL/M+D7a3BaFRmLWbdxJt4G amDAN6Fj0+k6aY99VRWJt7KfwsQJJN/flVwd6MmpHu307ETZlEQB9VXfZwLF1GV2b67w 4LJ58+h2zPTFMdqyVX2TT+9qr67O9nEAZsrK7eowbdkogzz1wNnra1IlElMFQcWyK38e ejx3uhWTlLliP8hiYbn7GrqKsDMsmYSUFe5vzJgpqT1oFyB2BFT4iZTHBqMZarY5ZEau wZ9g== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 5-20020a630805000000b0046f3dfb9789si2202661pgi.477.2022.11.04.23.03.09; Fri, 04 Nov 2022 23:03:21 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229871AbiKEGCZ (ORCPT + 99 others); Sat, 5 Nov 2022 02:02:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60158 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229610AbiKEGBe (ORCPT ); Sat, 5 Nov 2022 02:01:34 -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 B454E2D764 for ; Fri, 4 Nov 2022 23:01:31 -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 00A0960A7C for ; Sat, 5 Nov 2022 06:01:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CF630C433D6; Sat, 5 Nov 2022 06:01:30 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.96) (envelope-from ) id 1orCFj-007OrF-07; Sat, 05 Nov 2022 02:01:59 -0400 Message-ID: <20221105060158.872068667@goodmis.org> User-Agent: quilt/0.66 Date: Sat, 05 Nov 2022 02:00:46 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Linus Torvalds , Thomas Gleixner , Stephen Boyd , Guenter Roeck , Anna-Maria Gleixner , Andrew Morton , Greg Kroah-Hartman , Jiri Slaby Subject: [PATCH v4a 22/38] timers: tty: Use timer_shutdown_sync() before freeing timer References: <20221105060024.598488967@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_PASS 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748634909479949754?= X-GMAIL-MSGID: =?utf-8?q?1748634909479949754?= From: "Steven Rostedt (Google)" Before a timer is freed, timer_shutdown_sync() must be called. Link: https://lore.kernel.org/all/20221104054053.431922658@goodmis.org/ Cc: Greg Kroah-Hartman Cc: Jiri Slaby Signed-off-by: Steven Rostedt (Google) --- drivers/tty/n_gsm.c | 2 +- drivers/tty/sysrq.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c index 5e516f5cac5a..6f48adecd1d4 100644 --- a/drivers/tty/n_gsm.c +++ b/drivers/tty/n_gsm.c @@ -2098,7 +2098,7 @@ static void gsm_dlci_free(struct tty_port *port) { struct gsm_dlci *dlci = container_of(port, struct gsm_dlci, port); - del_timer_sync(&dlci->t1); + timer_shutdown_sync(&dlci->t1); dlci->gsm->dlci[dlci->addr] = NULL; kfifo_free(&dlci->fifo); while ((dlci->skb = skb_dequeue(&dlci->skb_list))) diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c index d2b2720db6ca..b6e70c5cfa17 100644 --- a/drivers/tty/sysrq.c +++ b/drivers/tty/sysrq.c @@ -1003,7 +1003,7 @@ static void sysrq_disconnect(struct input_handle *handle) input_close_device(handle); cancel_work_sync(&sysrq->reinject_work); - del_timer_sync(&sysrq->keyreset_timer); + timer_shutdown_sync(&sysrq->keyreset_timer); input_unregister_handle(handle); kfree(sysrq); }