From patchwork Tue Jul 25 03:00: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: 125303 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp2205887vqg; Mon, 24 Jul 2023 20:26:10 -0700 (PDT) X-Google-Smtp-Source: APBJJlH5Z9Tvme8yESuojokcBFAuIHgstyQq6ZAWNKNynY2KrCsjKtcIW9U3iROe/nb0ZxiUJO7/ X-Received: by 2002:a17:902:c412:b0:1b8:6245:1235 with SMTP id k18-20020a170902c41200b001b862451235mr1678870plk.13.1690255570117; Mon, 24 Jul 2023 20:26:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690255570; cv=none; d=google.com; s=arc-20160816; b=LRt8rnQvkVFRgaVx3fKjouunFRs4jsqGcCZaOmnTP3WFFcY3RJCUBcVRn8Ugehn/TG +WkEQn6vn11nWxukfdoVFe2ztA5rVFzphSVoy9fcv1m4NLDJxg+s5Y/2rhPZJF8f6ZFb VBW0Rzyfe+3BUrF0eRpkZG2nqW4g6NsjQtHplBeg86qGbwtC2nb/vXejD/qYq3OUOTXP 0SIe2FB21BG2GZO0aPnV2zt6AOSQeA7kI0fMyKR7UQvJaw+4ow0Z6Wef6gxXJ3QiSyDm jXW08TJ3033TIAU8YyLA2kNhsFLpQTAbKUu5rKDnJnKyLXb9LGbocUdUU6YwMT4R1fQr zbrQ== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=Y7Db9CtYu9IW3X/wWavIFjW3pwP0JBOPHcat5DJxUPQ=; fh=0qZbkesdVDOwLQAQ4/SHw1aEi4sIgeTGayoY46taFq4=; b=SjYfyC16+TX4s4DxuC7aflkxkh4eTlJ/15fzzQJ83fSE7/fPtvyMU+HTwNBd9jnDrJ Zmu1aYo4YGoLbgpwsi80XSCKOOsAwV6KQSJl9JDJ9KNClYgsM0emferwFfDbOVRP6epJ XSrLF8TRkdr19IhAvfsO/P7HSqFjQ+seu/oL4AWi5GnKSsAfo/KJszUZUaaSM1FdHidR eBeMIG4pKOebjxvwXvnbBhoHcgVhwrBHP7xpXZp5p/g52jCuIb4YA1/1WT4O8vgOkZMK E30EvXfPlVqYgFVQbkvXKwpTpezDKXnQJUE+vN+ot0eRlCo0ve7wBLQnBSyw29f2Pn3J Uy5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b=RIRF2W4a; 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=163.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g191-20020a636bc8000000b0056341268ed7si10264427pgc.853.2023.07.24.20.25.57; Mon, 24 Jul 2023 20:26:10 -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=@163.com header.s=s110527 header.b=RIRF2W4a; 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=163.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231549AbjGYDCH (ORCPT + 99 others); Mon, 24 Jul 2023 23:02:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55378 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231578AbjGYDBv (ORCPT ); Mon, 24 Jul 2023 23:01:51 -0400 Received: from m12.mail.163.com (m12.mail.163.com [220.181.12.196]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 83DBD173D; Mon, 24 Jul 2023 20:01:47 -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=Y7Db9 CtYu9IW3X/wWavIFjW3pwP0JBOPHcat5DJxUPQ=; b=RIRF2W4aI3DUUx39z4OG9 6v5Rz2dG6AjeONNuuML9MW2NRCODYyvWmVmZpNYpiZOWefl+5OT8yGrRKmgyEnac IRiTO13k/Aa8QajqA79MbT55ZwFSnhz38Bi55aelv5dFicALob56UF+FwOtBVUc6 ORWNfK4LtN2IpIIIXTiSik= Received: from leanderwang-LC2.localdomain (unknown [111.206.145.21]) by zwqz-smtp-mta-g1-2 (Coremail) with SMTP id _____wC3TZbMOr9kRW7dBA--.23188S2; Tue, 25 Jul 2023 11:00:29 +0800 (CST) From: Zheng Wang To: s.shtylyov@omp.ru Cc: lee@kernel.org, linyunsheng@huawei.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, richardcochran@gmail.com, p.zabel@pengutronix.de, geert+renesas@glider.be, magnus.damm@gmail.com, yoshihiro.shimoda.uh@renesas.com, biju.das.jz@bp.renesas.com, wsa+renesas@sang-engineering.com, netdev@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org, hackerzheng666@gmail.com, 1395428693sheep@gmail.com, alex000young@gmail.com, Zheng Wang Subject: [PATCH v4] net: ravb: Fix possible UAF bug in ravb_remove Date: Tue, 25 Jul 2023 11:00:26 +0800 Message-Id: <20230725030026.1664873-1-zyytlz.wz@163.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CM-TRANSID: _____wC3TZbMOr9kRW7dBA--.23188S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7CF1DZF48JrWrZryUtr1xGrg_yoW8Xry3p3 9xKa4F9ws5J3WUWa1xJFs7ZFWrCw17Kr909FZ7Aw1rZ3Zay3WDXr1FgFy8Aw1UJFZ5t3Wa vrWUZ3Wxu3WDAa7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0pM4E_DUUUUU= X-Originating-IP: [111.206.145.21] X-CM-SenderInfo: h2113zf2oz6qqrwthudrp/xtbBRw+3U2I0Ut2f+wAAsR X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772361424657870529 X-GMAIL-MSGID: 1772361424657870529 In ravb_probe, priv->work was bound with ravb_tx_timeout_work. If timeout occurs, it will start the work. And if we call ravb_remove without finishing the work, there may be a use-after-free bug on ndev. Fix it by finishing the job before cleanup in ravb_remove. Note that this bug is found by static analysis, it might be false positive. Fixes: c156633f1353 ("Renesas Ethernet AVB driver proper") Signed-off-by: Zheng Wang Reviewed-by: Sergey Shtylyov --- v4: - add information about the bug was found suggested by Yunsheng Lin v3: - fix typo in commit message v2: - stop dev_watchdog so that handle no more timeout work suggested by Yunsheng Lin, add an empty line to make code clear suggested by Sergey Shtylyov --- drivers/net/ethernet/renesas/ravb_main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c index 4d6b3b7d6abb..ce2da5101e51 100644 --- a/drivers/net/ethernet/renesas/ravb_main.c +++ b/drivers/net/ethernet/renesas/ravb_main.c @@ -2885,6 +2885,9 @@ static int ravb_remove(struct platform_device *pdev) struct ravb_private *priv = netdev_priv(ndev); const struct ravb_hw_info *info = priv->info; + netif_carrier_off(ndev); + netif_tx_disable(ndev); + cancel_work_sync(&priv->work); /* Stop PTP Clock driver */ if (info->ccc_gac) ravb_ptp_stop(ndev);