diff options
author | Johan Hovold <johan@kernel.org> | 2015-02-18 10:34:50 +0700 |
---|---|---|
committer | Johan Hovold <johan@kernel.org> | 2015-02-26 17:08:36 +0100 |
commit | 07fdfc5e9f1c966be8722e8fa927e5ea140df5ce (patch) | |
tree | 4728261d05363f71ff04ce4defe2f5a37cb0fa67 /drivers/usb/serial | |
parent | 5ee0089b1f7057d8f783db37b2a8116cd114f6e5 (diff) | |
download | op-kernel-dev-07fdfc5e9f1c966be8722e8fa927e5ea140df5ce.zip op-kernel-dev-07fdfc5e9f1c966be8722e8fa927e5ea140df5ce.tar.gz |
USB: serial: fix potential use-after-free after failed probe
Fix return value in probe error path, which could end up returning
success (0) on errors. This could in turn lead to use-after-free or
double free (e.g. in port_remove) when the port device is removed.
Fixes: c706ebdfc895 ("USB: usb-serial: call port_probe and port_remove
at the right times")
Cc: stable <stable@vger.kernel.org> # v2.6.31
Signed-off-by: Johan Hovold <johan@kernel.org>
Acked-by: Greg Kroah-Hartman <greg@kroah.com>
Diffstat (limited to 'drivers/usb/serial')
-rw-r--r-- | drivers/usb/serial/bus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/bus.c b/drivers/usb/serial/bus.c index 9374bd2..5d8d866 100644 --- a/drivers/usb/serial/bus.c +++ b/drivers/usb/serial/bus.c @@ -75,7 +75,7 @@ static int usb_serial_device_probe(struct device *dev) retval = device_create_file(dev, &dev_attr_port_number); if (retval) { if (driver->port_remove) - retval = driver->port_remove(port); + driver->port_remove(port); goto exit_with_autopm; } |