Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752871AbaFDOzf (ORCPT ); Wed, 4 Jun 2014 10:55:35 -0400 Received: from mail-qg0-f41.google.com ([209.85.192.41]:41676 "EHLO mail-qg0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752018AbaFDOzb (ORCPT ); Wed, 4 Jun 2014 10:55:31 -0400 Message-ID: <538F3360.40407@mutualink.net> Date: Wed, 04 Jun 2014 10:55:28 -0400 From: Mike Remski User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130110 Thunderbird/17.0.2 MIME-Version: 1.0 To: Johan Hovold CC: linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org Subject: Re: ftdi_sio BUG: NULL pointer dereference References: <20140602154036.GA8662@localhost> <538CA020.4070204@mutualink.net> <20140602162027.GB13790@localhost> <538CA54C.4040803@mutualink.net> <20140602164957.GC13790@localhost> <538CB049.9020805@mutualink.net> <20140602174630.GD13790@localhost> <538DA0BD.5080208@mutualink.net> <20140604141937.GA11160@localhost> <538F2D51.2010508@mutualink.net> <20140604145200.GB11160@localhost> In-Reply-To: <20140604145200.GB11160@localhost> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 06/04/2014 10:52 AM, Johan Hovold wrote: > On Wed, Jun 04, 2014 at 10:29:37AM -0400, Mike Remski wrote: >> On 06/04/2014 10:19 AM, Johan Hovold wrote: >>> >From 4ddea3a573b8c15beefb67bc35c440850063d79d Mon Sep 17 00:00:00 2001 >>> From: Johan Hovold >>> Date: Wed, 4 Jun 2014 14:09:43 +0200 >>> Subject: [PATCH 1/5] USB: ftdi_sio: fix null deref at port probe >>> >>> Fix NULL-pointer dereference when probing an interface with no >>> endpoints. >>> >>> These devices have two bulk endpoints per interface, but this avoids >>> crashing the kernel if a user forces a non-FTDI device to be probed. >>> >>> Note that the iterator variable was made unsigned in order to avoid >>> a maybe-uninitialized compiler warning for ep_desc after the loop. >>> >>> Fixes: 895f28badce9 ("USB: ftdi_sio: fix hi-speed device packet size >>> calculation") >>> >>> Reported-by: Mike Remski >>> Cc: # 2.3.61 >>> Signed-off-by: Johan Hovold >>> --- >>> drivers/usb/serial/ftdi_sio.c | 7 +++++-- >>> 1 file changed, 5 insertions(+), 2 deletions(-) >>> >>> diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c >>> index 7c6e1dedeb06..3019141397eb 100644 >>> --- a/drivers/usb/serial/ftdi_sio.c >>> +++ b/drivers/usb/serial/ftdi_sio.c >>> @@ -1564,14 +1564,17 @@ static void ftdi_set_max_packet_size(struct usb_serial_port *port) >>> struct usb_device *udev = serial->dev; >>> >>> struct usb_interface *interface = serial->interface; >>> - struct usb_endpoint_descriptor *ep_desc = &interface->cur_altsetting->endpoint[1].desc; >>> + struct usb_endpoint_descriptor *ep_desc; >>> >>> unsigned num_endpoints; >>> - int i; >>> + unsigned i; >>> >>> num_endpoints = interface->cur_altsetting->desc.bNumEndpoints; >>> dev_info(&udev->dev, "Number of endpoints %d\n", num_endpoints); >>> >>> + if (!num_endpoints) >>> + return; >>> + >>> /* NOTE: some customers have programmed FT232R/FT245R devices >>> * with an endpoint size of 0 - not good. In this case, we >>> * want to override the endpoint descriptor setting and use a >> Thanks Johan. I tried to get the cdc_acm working; did not have much >> luck/time (typical overcommit on workload) I will retry with the commit >> mentioned. >> I will try the patch today and get back to you. Nice on the ep_desc: >> looking at the code priv->max_packet_size is attached to the port, your >> change would use the last thing off of cur_altsetting->endpoint[], but >> I'm wondering if we should actually be setting priv->max_packet_size to >> whatever the max is of all endpoint[].desc->wMaxPacketSize? >> >> Thoughts? > This is the exact same behaviour as the old code (minus the NULL-deref). > > These device have two bulk endpoints per interface and they are supposed > to be using the same max packet size (64 or 512 depending on device and > host). > > This value is also used during depacketisation of incoming data (and > packetisation of outgoing data for legacy devices). I'm pretty convinced > you're using the wrong driver, something which would lead to corruption > of incoming data when the (non-existing) status bytes are stripped from > the stream. > > You really should try cdc-acm. > > Johan Sorry, forgot to add: Tested patch and it works as desired. -- Office: (978)401-4032 (x123 internally) Cell: (603) 759-6953 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/