* [PATCH] usb: gadget: Check bmAttributes only if configuration is valid
@ 2025-02-24 8:56 Prashanth K
2025-02-24 9:06 ` Greg Kroah-Hartman
0 siblings, 1 reply; 4+ messages in thread
From: Prashanth K @ 2025-02-24 8:56 UTC (permalink / raw)
To: Greg Kroah-Hartman, Kees Bakker, William McVicker,
Marek Szyprowski
Cc: linux-usb, linux-kernel, Prashanth K, stable
If the USB configuration is not valid, then avoid checking for
bmAttributes to prevent null pointer deference.
Cc: stable@vger.kernel.org
Fixes: 40e89ff5750f ("usb: gadget: Set self-powered based on MaxPower and bmAttributes")
Signed-off-by: Prashanth K <prashanth.k@oss.qualcomm.com>
---
drivers/usb/gadget/composite.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index 4bcf73bae761..869ad99afb48 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -1051,7 +1051,7 @@ static int set_config(struct usb_composite_dev *cdev,
usb_gadget_set_remote_wakeup(gadget, 0);
done:
if (power > USB_SELF_POWER_VBUS_MAX_DRAW ||
- !(c->bmAttributes & USB_CONFIG_ATT_SELFPOWER))
+ (c && !(c->bmAttributes & USB_CONFIG_ATT_SELFPOWER)))
usb_gadget_clear_selfpowered(gadget);
else
usb_gadget_set_selfpowered(gadget);
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] usb: gadget: Check bmAttributes only if configuration is valid
2025-02-24 8:56 [PATCH] usb: gadget: Check bmAttributes only if configuration is valid Prashanth K
@ 2025-02-24 9:06 ` Greg Kroah-Hartman
2025-02-24 9:23 ` Prashanth K
0 siblings, 1 reply; 4+ messages in thread
From: Greg Kroah-Hartman @ 2025-02-24 9:06 UTC (permalink / raw)
To: Prashanth K
Cc: Kees Bakker, William McVicker, Marek Szyprowski, linux-usb,
linux-kernel, stable
On Mon, Feb 24, 2025 at 02:26:04PM +0530, Prashanth K wrote:
> If the USB configuration is not valid, then avoid checking for
> bmAttributes to prevent null pointer deference.
>
> Cc: stable@vger.kernel.org
> Fixes: 40e89ff5750f ("usb: gadget: Set self-powered based on MaxPower and bmAttributes")
> Signed-off-by: Prashanth K <prashanth.k@oss.qualcomm.com>
> ---
> drivers/usb/gadget/composite.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
> index 4bcf73bae761..869ad99afb48 100644
> --- a/drivers/usb/gadget/composite.c
> +++ b/drivers/usb/gadget/composite.c
> @@ -1051,7 +1051,7 @@ static int set_config(struct usb_composite_dev *cdev,
> usb_gadget_set_remote_wakeup(gadget, 0);
> done:
> if (power > USB_SELF_POWER_VBUS_MAX_DRAW ||
> - !(c->bmAttributes & USB_CONFIG_ATT_SELFPOWER))
> + (c && !(c->bmAttributes & USB_CONFIG_ATT_SELFPOWER)))
> usb_gadget_clear_selfpowered(gadget);
> else
> usb_gadget_set_selfpowered(gadget);
> --
> 2.25.1
>
>
Have you checked linux-next yet for this fix that was posted last week?
Does that not resolve the issue for you?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] usb: gadget: Check bmAttributes only if configuration is valid
2025-02-24 9:06 ` Greg Kroah-Hartman
@ 2025-02-24 9:23 ` Prashanth K
2025-02-24 9:51 ` Greg Kroah-Hartman
0 siblings, 1 reply; 4+ messages in thread
From: Prashanth K @ 2025-02-24 9:23 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Kees Bakker, William McVicker, Marek Szyprowski, linux-usb,
linux-kernel, stable
On 24-02-25 02:36 pm, Greg Kroah-Hartman wrote:
> On Mon, Feb 24, 2025 at 02:26:04PM +0530, Prashanth K wrote:
>> If the USB configuration is not valid, then avoid checking for
>> bmAttributes to prevent null pointer deference.
>>
>> Cc: stable@vger.kernel.org
>> Fixes: 40e89ff5750f ("usb: gadget: Set self-powered based on MaxPower and bmAttributes")
>> Signed-off-by: Prashanth K <prashanth.k@oss.qualcomm.com>
>> ---
>> drivers/usb/gadget/composite.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
>> index 4bcf73bae761..869ad99afb48 100644
>> --- a/drivers/usb/gadget/composite.c
>> +++ b/drivers/usb/gadget/composite.c
>> @@ -1051,7 +1051,7 @@ static int set_config(struct usb_composite_dev *cdev,
>> usb_gadget_set_remote_wakeup(gadget, 0);
>> done:
>> if (power > USB_SELF_POWER_VBUS_MAX_DRAW ||
>> - !(c->bmAttributes & USB_CONFIG_ATT_SELFPOWER))
>> + (c && !(c->bmAttributes & USB_CONFIG_ATT_SELFPOWER)))
>> usb_gadget_clear_selfpowered(gadget);
>> else
>> usb_gadget_set_selfpowered(gadget);
>> --
>> 2.25.1
>>
>>
>
> Have you checked linux-next yet for this fix that was posted last week?
> Does that not resolve the issue for you?
>
> thanks,
>
> greg k-h
I hope you are mentioning this one -
https://lore.kernel.org/all/20250220120314.3614330-1-m.szyprowski@samsung.com/
The above patch fixes null pointer in composite_suspend(), I'm trying to
address a similar bug which is present in set_config(), it gets exposed
if the requested configuration is not present in cdev->configs.
Regards,
Prashanth K
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] usb: gadget: Check bmAttributes only if configuration is valid
2025-02-24 9:23 ` Prashanth K
@ 2025-02-24 9:51 ` Greg Kroah-Hartman
0 siblings, 0 replies; 4+ messages in thread
From: Greg Kroah-Hartman @ 2025-02-24 9:51 UTC (permalink / raw)
To: Prashanth K
Cc: Kees Bakker, William McVicker, Marek Szyprowski, linux-usb,
linux-kernel, stable
On Mon, Feb 24, 2025 at 02:53:59PM +0530, Prashanth K wrote:
>
>
> On 24-02-25 02:36 pm, Greg Kroah-Hartman wrote:
> > On Mon, Feb 24, 2025 at 02:26:04PM +0530, Prashanth K wrote:
> >> If the USB configuration is not valid, then avoid checking for
> >> bmAttributes to prevent null pointer deference.
> >>
> >> Cc: stable@vger.kernel.org
> >> Fixes: 40e89ff5750f ("usb: gadget: Set self-powered based on MaxPower and bmAttributes")
> >> Signed-off-by: Prashanth K <prashanth.k@oss.qualcomm.com>
> >> ---
> >> drivers/usb/gadget/composite.c | 2 +-
> >> 1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >> diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
> >> index 4bcf73bae761..869ad99afb48 100644
> >> --- a/drivers/usb/gadget/composite.c
> >> +++ b/drivers/usb/gadget/composite.c
> >> @@ -1051,7 +1051,7 @@ static int set_config(struct usb_composite_dev *cdev,
> >> usb_gadget_set_remote_wakeup(gadget, 0);
> >> done:
> >> if (power > USB_SELF_POWER_VBUS_MAX_DRAW ||
> >> - !(c->bmAttributes & USB_CONFIG_ATT_SELFPOWER))
> >> + (c && !(c->bmAttributes & USB_CONFIG_ATT_SELFPOWER)))
> >> usb_gadget_clear_selfpowered(gadget);
> >> else
> >> usb_gadget_set_selfpowered(gadget);
> >> --
> >> 2.25.1
> >>
> >>
> >
> > Have you checked linux-next yet for this fix that was posted last week?
> > Does that not resolve the issue for you?
> >
> > thanks,
> >
> > greg k-h
>
> I hope you are mentioning this one -
> https://lore.kernel.org/all/20250220120314.3614330-1-m.szyprowski@samsung.com/
Yes.
> The above patch fixes null pointer in composite_suspend(), I'm trying to
> address a similar bug which is present in set_config(), it gets exposed
> if the requested configuration is not present in cdev->configs.
Ah, missed that, sorry. I'll go queue this up too.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-02-24 9:51 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-02-24 8:56 [PATCH] usb: gadget: Check bmAttributes only if configuration is valid Prashanth K
2025-02-24 9:06 ` Greg Kroah-Hartman
2025-02-24 9:23 ` Prashanth K
2025-02-24 9:51 ` 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