diff options
| author | Johan Hovold <johan@kernel.org> | 2017-01-12 14:56:17 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-10-08 10:11:20 +0200 |
| commit | 920027fef71971daf64658c6f6bbfdebde161b0a (patch) | |
| tree | 1cd93f3942242c8804d428d4bebe72dcdf6cd1bc | |
| parent | 7e4194e7e7f4d744b0de96843a3a645c455d60a9 (diff) | |
| download | linux-stable-920027fef71971daf64658c6f6bbfdebde161b0a.tar.gz linux-stable-920027fef71971daf64658c6f6bbfdebde161b0a.tar.bz2 linux-stable-920027fef71971daf64658c6f6bbfdebde161b0a.zip | |
USB: serial: mos7720: fix control-message error handling
[ Upstream commit 0d130367abf582e7cbf60075c2a7ab53817b1d14 ]
Make sure to log an error on short transfers when reading a device
register.
Also clear the provided buffer (which if often an uninitialised
automatic variable) on errors as the driver currently does not bother to
check for errors.
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/usb/serial/mos7720.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c index c3b8ae360424..5e3a609fbab4 100644 --- a/drivers/usb/serial/mos7720.c +++ b/drivers/usb/serial/mos7720.c @@ -236,11 +236,16 @@ static int read_mos_reg(struct usb_serial *serial, unsigned int serial_portnum, status = usb_control_msg(usbdev, pipe, request, requesttype, value, index, buf, 1, MOS_WDR_TIMEOUT); - if (status == 1) + if (status == 1) { *data = *buf; - else if (status < 0) + } else { dev_err(&usbdev->dev, "mos7720: usb_control_msg() failed: %d\n", status); + if (status >= 0) + status = -EIO; + *data = 0; + } + kfree(buf); return status; |