From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-Id: <20130911042927.109375839@goodmis.org> Date: Wed, 11 Sep 2013 00:30:37 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Johan Hovold , Greg Kroah-Hartman Subject: [210/251] USB: keyspan: fix null-deref at disconnect and release References: <20130911042707.738353451@goodmis.org> Content-Disposition: inline; filename=0210-USB-keyspan-fix-null-deref-at-disconnect-and-release.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: 3.6.11.9-rc1 stable review patch. If anyone has any objections, please let me know. ------------------ From: Johan Hovold [ Upstream commit ff8a43c10f1440f07a5faca0c1556921259f7f76 ] 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 Signed-off-by: Greg Kroah-Hartman Signed-off-by: Steven Rostedt --- drivers/usb/serial/keyspan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c index caf85ab..c9e3455 100644 --- a/drivers/usb/serial/keyspan.c +++ b/drivers/usb/serial/keyspan.c @@ -2389,7 +2389,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 */ -- 1.7.10.4