[PATCH 3.2 030/199] USB: serial: kl5kusb105: abort on open exception path

From: Ben Hutchings
Date: Fri Mar 10 2017 - 08:16:40 EST

3.2.87-rc1 review patch. If anyone has any objections, please let me know.


From: Pan Bian <bianpan2016@xxxxxxx>

commit 3c3dd1e058cb01e835dcade4b54a6f13ffaeaf7c upstream.

Function klsi_105_open() calls usb_control_msg() (to "enable read") and
checks its return value. When the return value is unexpected, it only
assigns the error code to the return variable retval, but does not
terminate the exception path. This patch fixes the bug by inserting
"goto err_generic_close;" when the call to usb_control_msg() fails.

Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Signed-off-by: Pan Bian <bianpan2016@xxxxxxx>
[johan: rebase on prerequisite fix and amend commit message]
Signed-off-by: Johan Hovold <johan@xxxxxxxxxx>
Signed-off-by: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
drivers/usb/serial/kl5kusb105.c | 2 ++
1 file changed, 2 insertions(+)

--- a/drivers/usb/serial/kl5kusb105.c
+++ b/drivers/usb/serial/kl5kusb105.c
@@ -353,6 +353,7 @@ static int klsi_105_open(struct tty_str
if (rc < 0) {
dev_err(&port->dev, "Enabling read failed (error = %d)\n", rc);
retval = rc;
+ goto err_generic_close;
} else
dbg("%s - enabled reading", __func__);

@@ -379,6 +380,7 @@ err_disable_read:
0, /* index */
NULL, 0,