From: Greg Kroah-Hartman Date: Tue, 28 Feb 2012 17:20:09 +0000 (-0800) Subject: USB: ftdi_sio: fix problem when the manufacture is a NULL string X-Git-Tag: v3.0.27~103 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9c7725750f3c268f0fced0bee357169ed373fc91;p=karo-tx-linux.git USB: ftdi_sio: fix problem when the manufacture is a NULL string commit 656d2b3964a9d0f9864d472f8dfa2dd7dd42e6c0 upstream. 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 Tested-by: Wojciech M Zabolotny Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 78c7d420bdd0..264ed9a98254 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c @@ -1755,7 +1755,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;