diff mbox series

[RESEND] media: flexcop-usb: fix endpoint type check

Message ID 20220822151027.27026-1-johan@kernel.org (mailing list archive)
State Accepted
Commit 763679f0eeff0185fc431498849bbc1c24460875
Headers show
Series [RESEND] media: flexcop-usb: fix endpoint type check | expand

Commit Message

Johan Hovold Aug. 22, 2022, 3:10 p.m. UTC
Commit d725d20e81c2 ("media: flexcop-usb: sanity checking of endpoint
type") tried to add an endpoint type sanity check for the single
isochronous endpoint but instead broke the driver by checking the wrong
descriptor or random data beyond the last endpoint descriptor.

Make sure to check the right endpoint descriptor.

Fixes: d725d20e81c2 ("media: flexcop-usb: sanity checking of endpoint type")
Cc: Oliver Neukum <oneukum@suse.com>
Cc: stable@vger.kernel.org	# 5.9
Reported-by: Dongliang Mu <mudongliangabcd@gmail.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
---

It's been two months and two completely ignored reminders so resending.

Can someone please pick this fix up and let me know when that has been
done?

Johan


 drivers/media/usb/b2c2/flexcop-usb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Johan Hovold Sept. 20, 2022, 9 a.m. UTC | #1
Mauro and Hans,

On Mon, Aug 22, 2022 at 05:10:27PM +0200, Johan Hovold wrote:
> Commit d725d20e81c2 ("media: flexcop-usb: sanity checking of endpoint
> type") tried to add an endpoint type sanity check for the single
> isochronous endpoint but instead broke the driver by checking the wrong
> descriptor or random data beyond the last endpoint descriptor.
> 
> Make sure to check the right endpoint descriptor.
> 
> Fixes: d725d20e81c2 ("media: flexcop-usb: sanity checking of endpoint type")
> Cc: Oliver Neukum <oneukum@suse.com>
> Cc: stable@vger.kernel.org	# 5.9
> Reported-by: Dongliang Mu <mudongliangabcd@gmail.com>
> Signed-off-by: Johan Hovold <johan@kernel.org>
> ---
> 
> It's been two months and two completely ignored reminders so resending.
> 
> Can someone please pick this fix up and let me know when that has been
> done?

It's been another month so sending yet another reminder. This driver as
been broken since 5.9 and I posted this fix almost four months ago and
have sent multiple reminders since.

Can someone please pick this one and the follow-up cleanups up?

Johan
 
>  drivers/media/usb/b2c2/flexcop-usb.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/media/usb/b2c2/flexcop-usb.c b/drivers/media/usb/b2c2/flexcop-usb.c
> index 7835bb0f32fc..e012b21c4fd7 100644
> --- a/drivers/media/usb/b2c2/flexcop-usb.c
> +++ b/drivers/media/usb/b2c2/flexcop-usb.c
> @@ -511,7 +511,7 @@ static int flexcop_usb_init(struct flexcop_usb *fc_usb)
>  
>  	if (fc_usb->uintf->cur_altsetting->desc.bNumEndpoints < 1)
>  		return -ENODEV;
> -	if (!usb_endpoint_is_isoc_in(&fc_usb->uintf->cur_altsetting->endpoint[1].desc))
> +	if (!usb_endpoint_is_isoc_in(&fc_usb->uintf->cur_altsetting->endpoint[0].desc))
>  		return -ENODEV;
>  
>  	switch (fc_usb->udev->speed) {
Greg Kroah-Hartman Sept. 22, 2022, 8:41 a.m. UTC | #2
On Tue, Sep 20, 2022 at 11:00:35AM +0200, Johan Hovold wrote:
> Mauro and Hans,
> 
> On Mon, Aug 22, 2022 at 05:10:27PM +0200, Johan Hovold wrote:
> > Commit d725d20e81c2 ("media: flexcop-usb: sanity checking of endpoint
> > type") tried to add an endpoint type sanity check for the single
> > isochronous endpoint but instead broke the driver by checking the wrong
> > descriptor or random data beyond the last endpoint descriptor.
> > 
> > Make sure to check the right endpoint descriptor.
> > 
> > Fixes: d725d20e81c2 ("media: flexcop-usb: sanity checking of endpoint type")
> > Cc: Oliver Neukum <oneukum@suse.com>
> > Cc: stable@vger.kernel.org	# 5.9
> > Reported-by: Dongliang Mu <mudongliangabcd@gmail.com>
> > Signed-off-by: Johan Hovold <johan@kernel.org>
> > ---
> > 
> > It's been two months and two completely ignored reminders so resending.
> > 
> > Can someone please pick this fix up and let me know when that has been
> > done?
> 
> It's been another month so sending yet another reminder. This driver as
> been broken since 5.9 and I posted this fix almost four months ago and
> have sent multiple reminders since.
> 
> Can someone please pick this one and the follow-up cleanups up?

I've taken this one in my tree now.  Which one were the "follow-up"
cleanups?

thanks,

greg k-h
Johan Hovold Sept. 22, 2022, 9:37 a.m. UTC | #3
On Thu, Sep 22, 2022 at 10:41:43AM +0200, Greg Kroah-Hartman wrote:
> On Tue, Sep 20, 2022 at 11:00:35AM +0200, Johan Hovold wrote:
> > Mauro and Hans,
> > 
> > On Mon, Aug 22, 2022 at 05:10:27PM +0200, Johan Hovold wrote:
> > > Commit d725d20e81c2 ("media: flexcop-usb: sanity checking of endpoint
> > > type") tried to add an endpoint type sanity check for the single
> > > isochronous endpoint but instead broke the driver by checking the wrong
> > > descriptor or random data beyond the last endpoint descriptor.
> > > 
> > > Make sure to check the right endpoint descriptor.
> > > 
> > > Fixes: d725d20e81c2 ("media: flexcop-usb: sanity checking of endpoint type")
> > > Cc: Oliver Neukum <oneukum@suse.com>
> > > Cc: stable@vger.kernel.org	# 5.9
> > > Reported-by: Dongliang Mu <mudongliangabcd@gmail.com>
> > > Signed-off-by: Johan Hovold <johan@kernel.org>
> > > ---
> > > 
> > > It's been two months and two completely ignored reminders so resending.
> > > 
> > > Can someone please pick this fix up and let me know when that has been
> > > done?
> > 
> > It's been another month so sending yet another reminder. This driver as
> > been broken since 5.9 and I posted this fix almost four months ago and
> > have sent multiple reminders since.
> > 
> > Can someone please pick this one and the follow-up cleanups up?
> 
> I've taken this one in my tree now.  Which one were the "follow-up"
> cleanups?

Thanks. These are the follow-up cleanups:

	https://lore.kernel.org/lkml/20220822151456.27178-1-johan@kernel.org/

Perhaps we should start taking USB related changes like this through the
USB tree by default. Posting patches to the media subsystem feels like
shooting patches at a black hole.

Johan
Greg Kroah-Hartman Sept. 22, 2022, 10:12 a.m. UTC | #4
On Thu, Sep 22, 2022 at 11:37:36AM +0200, Johan Hovold wrote:
> On Thu, Sep 22, 2022 at 10:41:43AM +0200, Greg Kroah-Hartman wrote:
> > On Tue, Sep 20, 2022 at 11:00:35AM +0200, Johan Hovold wrote:
> > > Mauro and Hans,
> > > 
> > > On Mon, Aug 22, 2022 at 05:10:27PM +0200, Johan Hovold wrote:
> > > > Commit d725d20e81c2 ("media: flexcop-usb: sanity checking of endpoint
> > > > type") tried to add an endpoint type sanity check for the single
> > > > isochronous endpoint but instead broke the driver by checking the wrong
> > > > descriptor or random data beyond the last endpoint descriptor.
> > > > 
> > > > Make sure to check the right endpoint descriptor.
> > > > 
> > > > Fixes: d725d20e81c2 ("media: flexcop-usb: sanity checking of endpoint type")
> > > > Cc: Oliver Neukum <oneukum@suse.com>
> > > > Cc: stable@vger.kernel.org	# 5.9
> > > > Reported-by: Dongliang Mu <mudongliangabcd@gmail.com>
> > > > Signed-off-by: Johan Hovold <johan@kernel.org>
> > > > ---
> > > > 
> > > > It's been two months and two completely ignored reminders so resending.
> > > > 
> > > > Can someone please pick this fix up and let me know when that has been
> > > > done?
> > > 
> > > It's been another month so sending yet another reminder. This driver as
> > > been broken since 5.9 and I posted this fix almost four months ago and
> > > have sent multiple reminders since.
> > > 
> > > Can someone please pick this one and the follow-up cleanups up?
> > 
> > I've taken this one in my tree now.  Which one were the "follow-up"
> > cleanups?
> 
> Thanks. These are the follow-up cleanups:
> 
> 	https://lore.kernel.org/lkml/20220822151456.27178-1-johan@kernel.org/

Thanks, I'll take them after the first one was merged into Linus's tree.

> Perhaps we should start taking USB related changes like this through the
> USB tree by default. Posting patches to the media subsystem feels like
> shooting patches at a black hole.

I agree, there's been a bunch of patches sent there (some with security
fixes) that are not getting responded to :(

thanks,

greg k-h
Sean Young Sept. 22, 2022, 10:39 a.m. UTC | #5
On Thu, Sep 22, 2022 at 12:12:24PM +0200, Greg Kroah-Hartman wrote:
> On Thu, Sep 22, 2022 at 11:37:36AM +0200, Johan Hovold wrote:
> > Thanks. These are the follow-up cleanups:
> > 
> > 	https://lore.kernel.org/lkml/20220822151456.27178-1-johan@kernel.org/
> 
> Thanks, I'll take them after the first one was merged into Linus's tree.
> 
> > Perhaps we should start taking USB related changes like this through the
> > USB tree by default. Posting patches to the media subsystem feels like
> > shooting patches at a black hole.
> 
> I agree, there's been a bunch of patches sent there (some with security
> fixes) that are not getting responded to :(

The patches were missed are all DVB related, which is Mauro's responsibility.

As far as I can see, other parts of the media subsystem are well looked after.


Sean
Greg Kroah-Hartman Sept. 22, 2022, 10:43 a.m. UTC | #6
On Thu, Sep 22, 2022 at 11:39:27AM +0100, Sean Young wrote:
> On Thu, Sep 22, 2022 at 12:12:24PM +0200, Greg Kroah-Hartman wrote:
> > On Thu, Sep 22, 2022 at 11:37:36AM +0200, Johan Hovold wrote:
> > > Thanks. These are the follow-up cleanups:
> > > 
> > > 	https://lore.kernel.org/lkml/20220822151456.27178-1-johan@kernel.org/
> > 
> > Thanks, I'll take them after the first one was merged into Linus's tree.
> > 
> > > Perhaps we should start taking USB related changes like this through the
> > > USB tree by default. Posting patches to the media subsystem feels like
> > > shooting patches at a black hole.
> > 
> > I agree, there's been a bunch of patches sent there (some with security
> > fixes) that are not getting responded to :(
> 
> The patches were missed are all DVB related, which is Mauro's responsibility.
> 
> As far as I can see, other parts of the media subsystem are well looked after.

That's good, it's hard to know who is responsible for which parts at
times.

Hopefully Mauro comes back soon...

greg k-h
Greg Kroah-Hartman Sept. 26, 2022, 8:59 a.m. UTC | #7
On Thu, Sep 22, 2022 at 12:12:24PM +0200, Greg Kroah-Hartman wrote:
> On Thu, Sep 22, 2022 at 11:37:36AM +0200, Johan Hovold wrote:
> > On Thu, Sep 22, 2022 at 10:41:43AM +0200, Greg Kroah-Hartman wrote:
> > > On Tue, Sep 20, 2022 at 11:00:35AM +0200, Johan Hovold wrote:
> > > > Mauro and Hans,
> > > > 
> > > > On Mon, Aug 22, 2022 at 05:10:27PM +0200, Johan Hovold wrote:
> > > > > Commit d725d20e81c2 ("media: flexcop-usb: sanity checking of endpoint
> > > > > type") tried to add an endpoint type sanity check for the single
> > > > > isochronous endpoint but instead broke the driver by checking the wrong
> > > > > descriptor or random data beyond the last endpoint descriptor.
> > > > > 
> > > > > Make sure to check the right endpoint descriptor.
> > > > > 
> > > > > Fixes: d725d20e81c2 ("media: flexcop-usb: sanity checking of endpoint type")
> > > > > Cc: Oliver Neukum <oneukum@suse.com>
> > > > > Cc: stable@vger.kernel.org	# 5.9
> > > > > Reported-by: Dongliang Mu <mudongliangabcd@gmail.com>
> > > > > Signed-off-by: Johan Hovold <johan@kernel.org>
> > > > > ---
> > > > > 
> > > > > It's been two months and two completely ignored reminders so resending.
> > > > > 
> > > > > Can someone please pick this fix up and let me know when that has been
> > > > > done?
> > > > 
> > > > It's been another month so sending yet another reminder. This driver as
> > > > been broken since 5.9 and I posted this fix almost four months ago and
> > > > have sent multiple reminders since.
> > > > 
> > > > Can someone please pick this one and the follow-up cleanups up?
> > > 
> > > I've taken this one in my tree now.  Which one were the "follow-up"
> > > cleanups?
> > 
> > Thanks. These are the follow-up cleanups:
> > 
> > 	https://lore.kernel.org/lkml/20220822151456.27178-1-johan@kernel.org/
> 
> Thanks, I'll take them after the first one was merged into Linus's tree.

All now queued up, thanks.

greg k-h
diff mbox series

Patch

diff --git a/drivers/media/usb/b2c2/flexcop-usb.c b/drivers/media/usb/b2c2/flexcop-usb.c
index 7835bb0f32fc..e012b21c4fd7 100644
--- a/drivers/media/usb/b2c2/flexcop-usb.c
+++ b/drivers/media/usb/b2c2/flexcop-usb.c
@@ -511,7 +511,7 @@  static int flexcop_usb_init(struct flexcop_usb *fc_usb)
 
 	if (fc_usb->uintf->cur_altsetting->desc.bNumEndpoints < 1)
 		return -ENODEV;
-	if (!usb_endpoint_is_isoc_in(&fc_usb->uintf->cur_altsetting->endpoint[1].desc))
+	if (!usb_endpoint_is_isoc_in(&fc_usb->uintf->cur_altsetting->endpoint[0].desc))
 		return -ENODEV;
 
 	switch (fc_usb->udev->speed) {