Re: [PATCH] USB: visor: fix null-deref at probe

[Johan Hovold <johan@kernel.org>]

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