MIME-Version: 1.0
References: <20230309193020.374950-1-zyytlz.wz@163.com> <TYBPR01MB53412E8BDBB67C38E0B5E80CD8BA9@TYBPR01MB5341.jpnprd01.prod.outlook.com>
In-Reply-To: <TYBPR01MB53412E8BDBB67C38E0B5E80CD8BA9@TYBPR01MB5341.jpnprd01.prod.outlook.com>
From:   Zheng Hacker <hackerzheng666@gmail.com>
Date:   Sat, 11 Mar 2023 00:45:19 +0800
Message-ID: <CAJedcCy3fCLxcPP3a5iSXecX-dpKmsePiJ45HYKfJE2CZXq=6A@mail.gmail.com>
Subject: Re: [PATCH] usb: gadget: udc: renesas_usb3: Fix use after free bug in
 renesas_usb3_remove due to race condition
To:     Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Cc:     Zheng Wang <zyytlz.wz@163.com>,
        "gregkh@linuxfoundation.org" <gregkh@linuxfoundation.org>,
        "p.zabel@pengutronix.de" <p.zabel@pengutronix.de>,
        Biju Das <biju.das.jz@bp.renesas.com>,
        "phil.edworthy@renesas.com" <phil.edworthy@renesas.com>,
        "linux-usb@vger.kernel.org" <linux-usb@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "1395428693sheep@gmail.com" <1395428693sheep@gmail.com>,
        "alex000young@gmail.com" <alex000young@gmail.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> =E4=BA=8E2023=E5=B9=B4=
3=E6=9C=8810=E6=97=A5=E5=91=A8=E4=BA=94 12:56=E5=86=99=E9=81=93=EF=BC=9A
>
> 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 u=
sb 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_de=
vice *pdev)
> >  {
> >       struct renesas_usb3 *usb3 =3D 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 ta=
g:
>
> 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
>