* [PATCH] usb: gadget: udc: core: Fix double unlock in usb_gadget_activate()
@ 2023-06-15 15:43 Dan Carpenter
2023-06-15 18:10 ` Badhri Jagan Sridharan
2023-06-19 13:39 ` Greg Kroah-Hartman
0 siblings, 2 replies; 5+ messages in thread
From: Dan Carpenter @ 2023-06-15 15:43 UTC (permalink / raw)
To: Badhri Jagan Sridharan
Cc: Greg Kroah-Hartman, Alan Stern, Francesco Dolcini,
Krishna Kurapati, Elson Roy Serrao, linux-usb, kernel-janitors
Do not call mutex_unlock(&gadget->udc->connect_lock) twice in a row.
Fixes: 286d9975a838 ("usb: gadget: udc: core: Prevent soft_connect_store() race")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
---
drivers/usb/gadget/udc/core.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/usb/gadget/udc/core.c b/drivers/usb/gadget/udc/core.c
index 83fd1de14784..d58640a9d0ca 100644
--- a/drivers/usb/gadget/udc/core.c
+++ b/drivers/usb/gadget/udc/core.c
@@ -878,8 +878,6 @@ int usb_gadget_activate(struct usb_gadget *gadget)
*/
if (gadget->connected)
ret = usb_gadget_connect_locked(gadget);
- mutex_unlock(&gadget->udc->connect_lock);
-
unlock:
mutex_unlock(&gadget->udc->connect_lock);
trace_usb_gadget_activate(gadget, ret);
--
2.39.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] usb: gadget: udc: core: Fix double unlock in usb_gadget_activate()
2023-06-15 15:43 [PATCH] usb: gadget: udc: core: Fix double unlock in usb_gadget_activate() Dan Carpenter
@ 2023-06-15 18:10 ` Badhri Jagan Sridharan
2023-06-19 13:39 ` Greg Kroah-Hartman
1 sibling, 0 replies; 5+ messages in thread
From: Badhri Jagan Sridharan @ 2023-06-15 18:10 UTC (permalink / raw)
To: Dan Carpenter
Cc: Greg Kroah-Hartman, Alan Stern, Francesco Dolcini,
Krishna Kurapati, Elson Roy Serrao, linux-usb, kernel-janitors
Thanks Dan for posting this !
Regards,
Badhri
On Thu, Jun 15, 2023 at 8:43 AM Dan Carpenter <dan.carpenter@linaro.org> wrote:
>
> Do not call mutex_unlock(&gadget->udc->connect_lock) twice in a row.
>
> Fixes: 286d9975a838 ("usb: gadget: udc: core: Prevent soft_connect_store() race")
> Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Reviewed-by: Badhri Jagan Sridharan <badhri@google.com>
> ---
> drivers/usb/gadget/udc/core.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/drivers/usb/gadget/udc/core.c b/drivers/usb/gadget/udc/core.c
> index 83fd1de14784..d58640a9d0ca 100644
> --- a/drivers/usb/gadget/udc/core.c
> +++ b/drivers/usb/gadget/udc/core.c
> @@ -878,8 +878,6 @@ int usb_gadget_activate(struct usb_gadget *gadget)
> */
> if (gadget->connected)
> ret = usb_gadget_connect_locked(gadget);
> - mutex_unlock(&gadget->udc->connect_lock);
> -
> unlock:
> mutex_unlock(&gadget->udc->connect_lock);
> trace_usb_gadget_activate(gadget, ret);
> --
> 2.39.2
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] usb: gadget: udc: core: Fix double unlock in usb_gadget_activate()
2023-06-15 15:43 [PATCH] usb: gadget: udc: core: Fix double unlock in usb_gadget_activate() Dan Carpenter
2023-06-15 18:10 ` Badhri Jagan Sridharan
@ 2023-06-19 13:39 ` Greg Kroah-Hartman
2023-06-19 14:46 ` Dan Carpenter
1 sibling, 1 reply; 5+ messages in thread
From: Greg Kroah-Hartman @ 2023-06-19 13:39 UTC (permalink / raw)
To: Dan Carpenter
Cc: Badhri Jagan Sridharan, Alan Stern, Francesco Dolcini,
Krishna Kurapati, Elson Roy Serrao, linux-usb, kernel-janitors
On Thu, Jun 15, 2023 at 06:43:03PM +0300, Dan Carpenter wrote:
> Do not call mutex_unlock(&gadget->udc->connect_lock) twice in a row.
>
> Fixes: 286d9975a838 ("usb: gadget: udc: core: Prevent soft_connect_store() race")
> Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
> ---
> drivers/usb/gadget/udc/core.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/drivers/usb/gadget/udc/core.c b/drivers/usb/gadget/udc/core.c
> index 83fd1de14784..d58640a9d0ca 100644
> --- a/drivers/usb/gadget/udc/core.c
> +++ b/drivers/usb/gadget/udc/core.c
> @@ -878,8 +878,6 @@ int usb_gadget_activate(struct usb_gadget *gadget)
> */
> if (gadget->connected)
> ret = usb_gadget_connect_locked(gadget);
> - mutex_unlock(&gadget->udc->connect_lock);
> -
> unlock:
> mutex_unlock(&gadget->udc->connect_lock);
> trace_usb_gadget_activate(gadget, ret);
> --
> 2.39.2
>
Does not apply to my tree :(
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] usb: gadget: udc: core: Fix double unlock in usb_gadget_activate()
2023-06-19 13:39 ` Greg Kroah-Hartman
@ 2023-06-19 14:46 ` Dan Carpenter
2023-06-19 15:06 ` Greg Kroah-Hartman
0 siblings, 1 reply; 5+ messages in thread
From: Dan Carpenter @ 2023-06-19 14:46 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Badhri Jagan Sridharan, Alan Stern, Francesco Dolcini,
Krishna Kurapati, Elson Roy Serrao, linux-usb, kernel-janitors
On Mon, Jun 19, 2023 at 03:39:05PM +0200, Greg Kroah-Hartman wrote:
> On Thu, Jun 15, 2023 at 06:43:03PM +0300, Dan Carpenter wrote:
> > Do not call mutex_unlock(&gadget->udc->connect_lock) twice in a row.
> >
> > Fixes: 286d9975a838 ("usb: gadget: udc: core: Prevent soft_connect_store() race")
> > Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
> > ---
> > drivers/usb/gadget/udc/core.c | 2 --
> > 1 file changed, 2 deletions(-)
> >
> > diff --git a/drivers/usb/gadget/udc/core.c b/drivers/usb/gadget/udc/core.c
> > index 83fd1de14784..d58640a9d0ca 100644
> > --- a/drivers/usb/gadget/udc/core.c
> > +++ b/drivers/usb/gadget/udc/core.c
> > @@ -878,8 +878,6 @@ int usb_gadget_activate(struct usb_gadget *gadget)
> > */
> > if (gadget->connected)
> > ret = usb_gadget_connect_locked(gadget);
> > - mutex_unlock(&gadget->udc->connect_lock);
> > -
> > unlock:
> > mutex_unlock(&gadget->udc->connect_lock);
> > trace_usb_gadget_activate(gadget, ret);
> > --
> > 2.39.2
> >
>
> Does not apply to my tree :(
No longer required. The patch was reverted.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] usb: gadget: udc: core: Fix double unlock in usb_gadget_activate()
2023-06-19 14:46 ` Dan Carpenter
@ 2023-06-19 15:06 ` Greg Kroah-Hartman
0 siblings, 0 replies; 5+ messages in thread
From: Greg Kroah-Hartman @ 2023-06-19 15:06 UTC (permalink / raw)
To: Dan Carpenter
Cc: Badhri Jagan Sridharan, Alan Stern, Francesco Dolcini,
Krishna Kurapati, Elson Roy Serrao, linux-usb, kernel-janitors
On Mon, Jun 19, 2023 at 05:46:28PM +0300, Dan Carpenter wrote:
> On Mon, Jun 19, 2023 at 03:39:05PM +0200, Greg Kroah-Hartman wrote:
> > On Thu, Jun 15, 2023 at 06:43:03PM +0300, Dan Carpenter wrote:
> > > Do not call mutex_unlock(&gadget->udc->connect_lock) twice in a row.
> > >
> > > Fixes: 286d9975a838 ("usb: gadget: udc: core: Prevent soft_connect_store() race")
> > > Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
> > > ---
> > > drivers/usb/gadget/udc/core.c | 2 --
> > > 1 file changed, 2 deletions(-)
> > >
> > > diff --git a/drivers/usb/gadget/udc/core.c b/drivers/usb/gadget/udc/core.c
> > > index 83fd1de14784..d58640a9d0ca 100644
> > > --- a/drivers/usb/gadget/udc/core.c
> > > +++ b/drivers/usb/gadget/udc/core.c
> > > @@ -878,8 +878,6 @@ int usb_gadget_activate(struct usb_gadget *gadget)
> > > */
> > > if (gadget->connected)
> > > ret = usb_gadget_connect_locked(gadget);
> > > - mutex_unlock(&gadget->udc->connect_lock);
> > > -
> > > unlock:
> > > mutex_unlock(&gadget->udc->connect_lock);
> > > trace_usb_gadget_activate(gadget, ret);
> > > --
> > > 2.39.2
> > >
> >
> > Does not apply to my tree :(
>
> No longer required. The patch was reverted.
Ah good, thanks for checking.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-06-19 15:07 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-06-15 15:43 [PATCH] usb: gadget: udc: core: Fix double unlock in usb_gadget_activate() Dan Carpenter
2023-06-15 18:10 ` Badhri Jagan Sridharan
2023-06-19 13:39 ` Greg Kroah-Hartman
2023-06-19 14:46 ` Dan Carpenter
2023-06-19 15:06 ` Greg Kroah-Hartman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox