usb: gadget: udc: renesas_usb3: Fix use after free bug in renesas_usb3_remove due to race condition
Message ID | 20230309193020.374950-1-zyytlz.wz@163.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp480373wrd; Thu, 9 Mar 2023 11:40:42 -0800 (PST) X-Google-Smtp-Source: AK7set9EIGz3Z2xfqkVLm6bIHcjp/9lSZAkLtg/yBQ9Q/IEqkGJL68E8Cfn4vlxHdy5jXHdIZFfR X-Received: by 2002:a05:6a20:3942:b0:cc:9ca2:8b5f with SMTP id r2-20020a056a20394200b000cc9ca28b5fmr27945002pzg.15.1678390842003; Thu, 09 Mar 2023 11:40:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678390841; cv=none; d=google.com; s=arc-20160816; b=xUAbnaFtXYu3NziQO1Hkp1Tpqy33tI4Ex/LgRIZWbtpjgSKl4dDHTMMXsy5eGrVhvY 1g6rW2uurtLNn2YobekpFtk3jgbYXlCQHdPIwCN5/9efGRoaMF7we+uxi3PU5i/SGLAU WG4MeON/Iet6UegD/YHEer8lilQyWsidcvlDdaMMhdKOg0uM9wf5yyEUDQNpFk2xLHls wsZa4SDdjKAZmm5/H16WKNyEWhd6Dwo/SuC1ykybgtA0HBrJ/emgdo+b2UbyjBJLd3Qx QMywlNuYUUbkutyqpu2q7znyUKGVZ6qGfbux/rt2UJgF9EUinszZwPimRymsNVZi2ITQ XKzw== 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=OLj0EEDcClubzWEsb6yI7uXbUc6GnDp13HNII7GwMQE=; b=YmTZ9Z86dsZxAXJgppW/2EHdBqJcz4u/vXo5NPwsgsQDGF7Zzho1JWDFQAZcT9VmDT oJkHJFX4aDIe+D5NnFvk/l+CIh8bulbI9Dj35Ejo/OrHCZpzoH+yIdHdeg+0EvhWttJV jwp3xXTWUDpER3NGliuuwI1zOtcnq8fHF16bXLToiLwe+w2LLUV50wy4/ImaVnCWgwAf 9k3TKrHm8NwgFsohbMjGFThSH/WpEfjIu3lwySHPKzUVxGjNJjYKGUuMJOWo4tfJ6Paj VkeVBCz5UJQ/HYreSNaC06WPgbcXnOHPvq/uSg3Wuxgop+5KAclVxTDs7CPkrueg3XaQ ZH/g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b=jBcveBzC; 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 w4-20020a656944000000b005030127c431si16524853pgq.808.2023.03.09.11.40.23; Thu, 09 Mar 2023 11:40:41 -0800 (PST) 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=jBcveBzC; 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 S230200AbjCITc7 (ORCPT <rfc822;carlos.wei.hk@gmail.com> + 99 others); Thu, 9 Mar 2023 14:32:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55900 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230130AbjCITcT (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Thu, 9 Mar 2023 14:32:19 -0500 Received: from m12.mail.163.com (m12.mail.163.com [220.181.12.214]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 29464F738E; Thu, 9 Mar 2023 11:31:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=OLj0E EDcClubzWEsb6yI7uXbUc6GnDp13HNII7GwMQE=; b=jBcveBzCfUz30qCgMUmJr VASNr0p2y6zNlGygFHgrRwBsPbKHGEubdlA8PmiTkF+K3gw6utYPZDbZDFFph9Lk QgrlHfR0BsPM0dny8UQHBGEGdnMWugVKXcMhuGR6IpdTyOngM65oTNjiaNYNiGbw vfCtbBIa1DFtxqMjjR9wQ0= Received: from leanderwang-LC2.localdomain (unknown [111.206.145.21]) by zwqz-smtp-mta-g0-1 (Coremail) with SMTP id _____wAHKnjOMwpkcqj6Cg--.38073S2; Fri, 10 Mar 2023 03:30:22 +0800 (CST) From: Zheng Wang <zyytlz.wz@163.com> To: gregkh@linuxfoundation.org Cc: p.zabel@pengutronix.de, biju.das.jz@bp.renesas.com, phil.edworthy@renesas.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, hackerzheng666@gmail.com, 1395428693sheep@gmail.com, alex000young@gmail.com, Zheng Wang <zyytlz.wz@163.com> Subject: [PATCH] usb: gadget: udc: renesas_usb3: Fix use after free bug in renesas_usb3_remove due to race condition Date: Fri, 10 Mar 2023 03:30:20 +0800 Message-Id: <20230309193020.374950-1-zyytlz.wz@163.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID: _____wAHKnjOMwpkcqj6Cg--.38073S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7tF1DGryfJr47CF4fCF15Arb_yoW8GF4DpF n8GrWrGr48GFy0qwsrGFyDZFyrCFyDKry3ZFWxKa1kuF1rG3y8Xr9Fqa1jkr17JFZ2yr4S q3WUu348tFW7u37anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0zi-eOJUUUUU= X-Originating-IP: [111.206.145.21] X-CM-SenderInfo: h2113zf2oz6qqrwthudrp/1tbiQhAtU1aEEmvBkgAAsU X-Spam-Status: No, score=-0.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_VALIDITY_RPBL,SPF_HELO_NONE,SPF_PASS autolearn=no 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759920355421791652?= X-GMAIL-MSGID: =?utf-8?q?1759920355421791652?= |
Series |
usb: gadget: udc: renesas_usb3: Fix use after free bug in renesas_usb3_remove due to race condition
|
|
Commit Message
Zheng Wang
March 9, 2023, 7:30 p.m. UTC
In renesas_usb3_probe, &usb3->role_work is bound with
renesas_usb3_role_work. renesas_usb3_start will be called
to start the work.
If we remove the module which will call renesas_usb3_remove
to make cleanup, there may be a unfinished work. The possible
sequence is as follows:
Fix it by canceling the work before cleanup in the renesas_usb3_remove
CPU0 CPUc1
|renesas_usb3_role_work
renesas_usb3_remove |
usb_role_switch_unregister |
device_unregister |
kfree(sw); |
free usb3->role_sw |
| usb_role_switch_set_role
| //use usb3->role_sw
Fixes: 39facfa01c9f ("usb: gadget: udc: renesas_usb3: Add register of usb role switch")
Signed-off-by: Zheng Wang <zyytlz.wz@163.com>
---
drivers/usb/gadget/udc/renesas_usb3.c | 2 ++
1 file changed, 2 insertions(+)
Comments
Hi Zheng, > From: Zheng Wang, Sent: Friday, March 10, 2023 4:30 AM > > In renesas_usb3_probe, &usb3->role_work is bound with > renesas_usb3_role_work. renesas_usb3_start will be called > to start the work. > > If we remove the module which will call renesas_usb3_remove > to make cleanup, there may be a unfinished work. The possible > sequence is as follows: Thank you for the patch! I think we should remove double spaces like below. (Also "an" unfinished): ----- If we remove the module which will call renesas_usb3_remove to make cleanup, there may be an unfinished work. The possible sequence is as follows: ----- > Fix it by canceling the work before cleanup in the renesas_usb3_remove > > CPU0 CPUc1 s/CPUc1/CPU1/ > |renesas_usb3_role_work > renesas_usb3_remove | > usb_role_switch_unregister | > device_unregister | > kfree(sw); | > free usb3->role_sw | > | usb_role_switch_set_role > | //use usb3->role_sw Adding a blank line here is better, I think. > Fixes: 39facfa01c9f ("usb: gadget: udc: renesas_usb3: Add register of usb role switch") > Signed-off-by: Zheng Wang <zyytlz.wz@163.com> > --- > drivers/usb/gadget/udc/renesas_usb3.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/usb/gadget/udc/renesas_usb3.c b/drivers/usb/gadget/udc/renesas_usb3.c > index bee6bceafc4f..23b5f1706d25 100644 > --- a/drivers/usb/gadget/udc/renesas_usb3.c > +++ b/drivers/usb/gadget/udc/renesas_usb3.c > @@ -2658,6 +2658,8 @@ static int renesas_usb3_remove(struct platform_device *pdev) > { > struct renesas_usb3 *usb3 = platform_get_drvdata(pdev); > > + cancel_work_sync(&usb3->extcon_work); IIUC, this work is not related to the issue. But, what do you think? If so, adding this should be a separate patch with the following Fixes tag: Fixes: 3b68e7ca3888 ("usb: gadget: udc: renesas_usb3: add extcon support") Best regards, Yoshihiro Shimoda > + cancel_work_sync(&usb3->role_work); > debugfs_remove_recursive(usb3->dentry); > device_remove_file(&pdev->dev, &dev_attr_role); > > -- > 2.25.1
Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> 于2023年3月10日周五 12:56写道: > > Hi Zheng, > > > From: Zheng Wang, Sent: Friday, March 10, 2023 4:30 AM > > > > In renesas_usb3_probe, &usb3->role_work is bound with > > renesas_usb3_role_work. renesas_usb3_start will be called > > to start the work. > > > > If we remove the module which will call renesas_usb3_remove > > to make cleanup, there may be a unfinished work. The possible > > sequence is as follows: > > Thank you for the patch! > I think we should remove double spaces like below. (Also "an" unfinished): > Thank you for your kind reminder.Will correct in the next version of patch. > ----- > If we remove the module which will call renesas_usb3_remove > to make cleanup, there may be an unfinished work. The possible > sequence is as follows: > ----- > > > Fix it by canceling the work before cleanup in the renesas_usb3_remove > > > > CPU0 CPUc1 > > s/CPUc1/CPU1/ > > > > |renesas_usb3_role_work > > renesas_usb3_remove | > > usb_role_switch_unregister | > > device_unregister | > > kfree(sw); | > > free usb3->role_sw | > > | usb_role_switch_set_role > > | //use usb3->role_sw > > Adding a blank line here is better, I think. Agree with that :) > > > Fixes: 39facfa01c9f ("usb: gadget: udc: renesas_usb3: Add register of usb role switch") > > Signed-off-by: Zheng Wang <zyytlz.wz@163.com> > > --- > > drivers/usb/gadget/udc/renesas_usb3.c | 2 ++ > > 1 file changed, 2 insertions(+) > > > > diff --git a/drivers/usb/gadget/udc/renesas_usb3.c b/drivers/usb/gadget/udc/renesas_usb3.c > > index bee6bceafc4f..23b5f1706d25 100644 > > --- a/drivers/usb/gadget/udc/renesas_usb3.c > > +++ b/drivers/usb/gadget/udc/renesas_usb3.c > > @@ -2658,6 +2658,8 @@ static int renesas_usb3_remove(struct platform_device *pdev) > > { > > struct renesas_usb3 *usb3 = platform_get_drvdata(pdev); > > > > + cancel_work_sync(&usb3->extcon_work); > > IIUC, this work is not related to the issue. > But, what do you think? > If so, adding this should be a separate patch with the following Fixes tag: > > Fixes: 3b68e7ca3888 ("usb: gadget: udc: renesas_usb3: add extcon support") > Yes, I didn't find the uaf part for this work. As I didn't see any code to cancel this work, I added it then. I think you are right. In the next version of patch, we'll only keep the cancel of related work. Best regards, Zheng > > > + cancel_work_sync(&usb3->role_work); > > debugfs_remove_recursive(usb3->dentry); > > device_remove_file(&pdev->dev, &dev_attr_role); > > > > -- > > 2.25.1 >
diff --git a/drivers/usb/gadget/udc/renesas_usb3.c b/drivers/usb/gadget/udc/renesas_usb3.c index bee6bceafc4f..23b5f1706d25 100644 --- a/drivers/usb/gadget/udc/renesas_usb3.c +++ b/drivers/usb/gadget/udc/renesas_usb3.c @@ -2658,6 +2658,8 @@ static int renesas_usb3_remove(struct platform_device *pdev) { struct renesas_usb3 *usb3 = platform_get_drvdata(pdev); + cancel_work_sync(&usb3->extcon_work); + cancel_work_sync(&usb3->role_work); debugfs_remove_recursive(usb3->dentry); device_remove_file(&pdev->dev, &dev_attr_role);