USB: ftdi_sio: fix problem when the manufacture is a NULL string
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 28 Feb 2012 17:20:09 +0000 (09:20 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 28 Feb 2012 17:22:04 +0000 (09:22 -0800)
On some misconfigured ftdi_sio devices, if the manufacturer string is
NULL, the kernel will oops when the device is plugged in.  This patch
fixes the problem.

Reported-by: Wojciech M Zabolotny <W.Zabolotny@elka.pw.edu.pl>
Tested-by: Wojciech M Zabolotny <W.Zabolotny@elka.pw.edu.pl>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/serial/ftdi_sio.c

index feafa85dd07ee9a2f7c9907f6d4115a0af6db0c6..9892626066849e8ddb3f4d465119aea98b2e1200 100644 (file)
@@ -1769,7 +1769,8 @@ static int ftdi_8u2232c_probe(struct usb_serial *serial)
 
        dbg("%s", __func__);
 
-       if (strcmp(udev->manufacturer, "CALAO Systems") == 0)
+       if ((udev->manufacturer) &&
+           (strcmp(udev->manufacturer, "CALAO Systems") == 0))
                return ftdi_jtag_probe(serial);
 
        return 0;