From patchwork Thu Mar 16 16:15:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Wang X-Patchwork-Id: 13178020 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 72EF1C6FD19 for ; Thu, 16 Mar 2023 16:17:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230205AbjCPQRn (ORCPT ); Thu, 16 Mar 2023 12:17:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37732 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230083AbjCPQRh (ORCPT ); Thu, 16 Mar 2023 12:17:37 -0400 Received: from m12.mail.163.com (m12.mail.163.com [220.181.12.215]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id A8BCBDC092; Thu, 16 Mar 2023 09:17:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=C2wJp Yaxa4KJLbkDGrqyFIsfrR/Zsfge7V/T0ks5HVI=; b=TVY0AJwCJkch2lITmYu6m iFdvTG4T+1xVTgPlU9dGsRafvsFj7GRK65jH+8j+6zGEDylvj8+JeBoxrdEZ50KQ 3yPeP1wPxPJlMspmhwRkVsjCXpmCTWQlqhCaBgIKU6Kbi7Xgbc5xTxqY0pO6WO5j X3rlx3iiPh/PdWKsLu+Be8= Received: from leanderwang-LC2.localdomain (unknown [111.206.145.21]) by zwqz-smtp-mta-g5-1 (Coremail) with SMTP id _____wB3db6fQBNkkyMfAQ--.49999S2; Fri, 17 Mar 2023 00:15:28 +0800 (CST) From: Zheng Wang To: davem@davemloft.net Cc: simon.horman@corigine.com, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, petrm@nvidia.com, thomas.lendacky@amd.com, wsa+renesas@sang-engineering.com, leon@kernel.org, shayagr@amazon.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, hackerzheng666@gmail.com, 1395428693sheep@gmail.com, alex000young@gmail.com, Zheng Wang Subject: [PATCH net v5] xirc2ps_cs: Fix use after free bug in xirc2ps_detach Date: Fri, 17 Mar 2023 00:15:26 +0800 Message-Id: <20230316161526.1568982-1-zyytlz.wz@163.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CM-TRANSID: _____wB3db6fQBNkkyMfAQ--.49999S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7WrWxuF4xKrW5Aw4UAFWDJwb_yoW8Xw1UpF WUJay5Zr4DX39Ivw4xJFyUJF1Yga93KayqgrZ3C3yS9rn8ArWqgryrKayjgFyxZrWkZF13 Ar1Y9ryxWFnrAaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0zijNtxUUUUU= X-Originating-IP: [111.206.145.21] X-CM-SenderInfo: h2113zf2oz6qqrwthudrp/1tbiGgc0U1aEEmZtZwAAsW Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org In xirc2ps_probe, the local->tx_timeout_task was bounded with xirc2ps_tx_timeout_task. When timeout occurs, it will call xirc_tx_timeout->schedule_work to start the work. When we call xirc2ps_detach to remove the driver, there may be a sequence as follows: Stop responding to timeout tasks and complete scheduled tasks before cleanup in xirc2ps_detach, which will fix the problem. CPU0 CPU1 |xirc2ps_tx_timeout_task xirc2ps_detach | free_netdev | kfree(dev); | | | do_reset | //use dev Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Zheng Wang --- v5: - mov patch to patch net v4: - fix indentation error again v3: - fix indentation error suggested by Jakub Kicinski v2: - fix indentation error suggested by Simon Horman, and stop the timeout tasks suggested by Yunsheng Lin --- drivers/net/ethernet/xircom/xirc2ps_cs.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/ethernet/xircom/xirc2ps_cs.c b/drivers/net/ethernet/xircom/xirc2ps_cs.c index 894e92ef415b..e04b3f7f2179 100644 --- a/drivers/net/ethernet/xircom/xirc2ps_cs.c +++ b/drivers/net/ethernet/xircom/xirc2ps_cs.c @@ -503,7 +503,12 @@ static void xirc2ps_detach(struct pcmcia_device *link) { struct net_device *dev = link->priv; + struct local_info *local = netdev_priv(dev); + netif_carrier_off(dev); + netif_tx_disable(dev); + cancel_work_sync(&local->tx_timeout_task); + dev_dbg(&link->dev, "detach\n"); unregister_netdev(dev);