USB: keyspan: fix null-deref at disconnect and release

jhovold · gregkh · commit ff8a43c10f14 · 2013-08-14T12:49:27.000-07:00
Make sure to fail properly if the device is not accepted during attach
in order to avoid null-pointer derefs (of missing interface private
data) at disconnect or release.

Cc: stable@vger.kernel.org
Signed-off-by: Johan Hovold &lt;jhovold@gmail.com&gt;
Signed-off-by: Greg Kroah-Hartman &lt;gregkh@linuxfoundation.org&gt;
diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c
@@ -2303,7 +2303,7 @@ static int keyspan_startup(struct usb_serial *serial)
 	if (d_details == NULL) {
 		dev_err(&serial->dev->dev, "%s - unknown product id %x\n",
 		    __func__, le16_to_cpu(serial->dev->descriptor.idProduct));
-		return 1;
+		return -ENODEV;
 	}
 
 	/* Setup private data for serial driver */

Original file line number	Diff line number	Diff line change
`@@ -2303,7 +2303,7 @@ static int keyspan_startup(struct usb_serial *serial)`
`2303`	`2303`	`if (d_details == NULL) {`
`2304`	`2304`	`dev_err(&serial->dev->dev, "%s - unknown product id %x\n",`
`2305`	`2305`	`__func__, le16_to_cpu(serial->dev->descriptor.idProduct));`
`2306`		`- return 1;`
	`2306`	`+ return -ENODEV;`
`2307`	`2307`	`}`
`2308`	`2308`
`2309`	`2309`	`/* Setup private data for serial driver */`