aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorJohan Hovold <johan@kernel.org>2015-02-18 10:34:50 +0700
committerBen Hutchings <ben@decadent.org.uk>2015-05-09 23:16:21 +0100
commit7f073a838187213d46fdd4bc8f319ad6195165d2 (patch)
treed55bcc931dda2d74c747de2e7b6919f1e0518f84 /drivers/usb
parent31cf4590fa138a95ccbd91d90544f9b11d2da269 (diff)
downloadkernel_samsung_smdk4412-7f073a838187213d46fdd4bc8f319ad6195165d2.zip
kernel_samsung_smdk4412-7f073a838187213d46fdd4bc8f319ad6195165d2.tar.gz
kernel_samsung_smdk4412-7f073a838187213d46fdd4bc8f319ad6195165d2.tar.bz2
USB: serial: fix potential use-after-free after failed probe
commit 07fdfc5e9f1c966be8722e8fa927e5ea140df5ce upstream. 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") Signed-off-by: Johan Hovold <johan@kernel.org> Acked-by: Greg Kroah-Hartman <greg@kroah.com> [bwh: Backported to 3.2: adjust context] Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/serial/bus.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/bus.c b/drivers/usb/serial/bus.c
index 7f547dc..020b515 100644
--- a/drivers/usb/serial/bus.c
+++ b/drivers/usb/serial/bus.c
@@ -73,7 +73,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;
}