* [PATCH] USB: visor: fix null-deref at probe
@ 2016-01-12 11:05 Johan Hovold
2016-01-12 11:08 ` Johan Hovold
2016-01-25 10:05 ` Johan Hovold
0 siblings, 2 replies; 3+ messages in thread
From: Johan Hovold @ 2016-01-12 11:05 UTC (permalink / raw)
To: linux-usb; +Cc: Vladis Dronov, Johan Hovold, stable
Fix null-pointer dereference at probe should a (malicious) Treo device
lack the expected endpoints.
Specifically, the Treo port-setup hack was dereferencing the bulk-in and
interrupt-in urbs without first making sure they had been allocated by
core.
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
---
drivers/usb/serial/visor.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c
index 60afb39eb73c..c53fbb3e0b8c 100644
--- a/drivers/usb/serial/visor.c
+++ b/drivers/usb/serial/visor.c
@@ -544,6 +544,11 @@ static int treo_attach(struct usb_serial *serial)
(serial->num_interrupt_in == 0))
return 0;
+ if (serial->num_bulk_in < 2 || serial->num_interrupt_in < 2) {
+ dev_err(&serial->interface->dev, "missing endpoints\n");
+ return -ENODEV;
+ }
+
/*
* It appears that Treos and Kyoceras want to use the
* 1st bulk in endpoint to communicate with the 2nd bulk out endpoint,
--
2.4.10
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] USB: visor: fix null-deref at probe
2016-01-12 11:05 [PATCH] USB: visor: fix null-deref at probe Johan Hovold
@ 2016-01-12 11:08 ` Johan Hovold
2016-01-25 10:05 ` Johan Hovold
1 sibling, 0 replies; 3+ messages in thread
From: Johan Hovold @ 2016-01-12 11:08 UTC (permalink / raw)
To: linux-usb; +Cc: Vladis Dronov, Johan Hovold, stable
On Tue, Jan 12, 2016 at 12:05:20PM +0100, Johan Hovold wrote:
> Fix null-pointer dereference at probe should a (malicious) Treo device
> lack the expected endpoints.
>
> Specifically, the Treo port-setup hack was dereferencing the bulk-in and
> interrupt-in urbs without first making sure they had been allocated by
> core.
>
> Cc: stable <stable@vger.kernel.org>
> Signed-off-by: Johan Hovold <johan@kernel.org>
> ---
Vladis,
turns out the Treo devices had a similar problem.
You should be able to just use just
if (serial->num_bulk_out < 2)
return -ENODEV;
for your case.
> drivers/usb/serial/visor.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c
> index 60afb39eb73c..c53fbb3e0b8c 100644
> --- a/drivers/usb/serial/visor.c
> +++ b/drivers/usb/serial/visor.c
> @@ -544,6 +544,11 @@ static int treo_attach(struct usb_serial *serial)
> (serial->num_interrupt_in == 0))
> return 0;
>
> + if (serial->num_bulk_in < 2 || serial->num_interrupt_in < 2) {
> + dev_err(&serial->interface->dev, "missing endpoints\n");
> + return -ENODEV;
> + }
> +
> /*
> * It appears that Treos and Kyoceras want to use the
> * 1st bulk in endpoint to communicate with the 2nd bulk out endpoint,
Thanks,
Johan
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] USB: visor: fix null-deref at probe
2016-01-12 11:05 [PATCH] USB: visor: fix null-deref at probe Johan Hovold
2016-01-12 11:08 ` Johan Hovold
@ 2016-01-25 10:05 ` Johan Hovold
1 sibling, 0 replies; 3+ messages in thread
From: Johan Hovold @ 2016-01-25 10:05 UTC (permalink / raw)
To: linux-usb; +Cc: Vladis Dronov, Johan Hovold, stable
On Tue, Jan 12, 2016 at 12:05:20PM +0100, Johan Hovold wrote:
> Fix null-pointer dereference at probe should a (malicious) Treo device
> lack the expected endpoints.
>
> Specifically, the Treo port-setup hack was dereferencing the bulk-in and
> interrupt-in urbs without first making sure they had been allocated by
> core.
>
> Cc: stable <stable@vger.kernel.org>
> Signed-off-by: Johan Hovold <johan@kernel.org>
> ---
> drivers/usb/serial/visor.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c
> index 60afb39eb73c..c53fbb3e0b8c 100644
> --- a/drivers/usb/serial/visor.c
> +++ b/drivers/usb/serial/visor.c
> @@ -544,6 +544,11 @@ static int treo_attach(struct usb_serial *serial)
> (serial->num_interrupt_in == 0))
> return 0;
>
> + if (serial->num_bulk_in < 2 || serial->num_interrupt_in < 2) {
> + dev_err(&serial->interface->dev, "missing endpoints\n");
> + return -ENODEV;
> + }
> +
> /*
> * It appears that Treos and Kyoceras want to use the
> * 1st bulk in endpoint to communicate with the 2nd bulk out endpoint,
Now applied.
Johan
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-01-25 10:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-01-12 11:05 [PATCH] USB: visor: fix null-deref at probe Johan Hovold
2016-01-12 11:08 ` Johan Hovold
2016-01-25 10:05 ` Johan Hovold
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.