Commit 0379d542 authored by Johan Hovold's avatar Johan Hovold Committed by Sasha Levin

USB: serial: quatech2: fix control-message error handling

[ Upstream commit 8c34cb8d ]

Make sure to detect short control-message transfers when fetching
modem and line state in open and when retrieving registers.

This specifically makes sure that an errno is returned to user space on
errors in TIOCMGET instead of a zero bitmask.

Also drop the unused getdevice function which also lacked appropriate
error handling.

Fixes: f7a33e60 ("USB: serial: add quatech2 usb to serial driver")
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
parent e2eaebce
...@@ -188,22 +188,22 @@ static inline int qt2_setdevice(struct usb_device *dev, u8 *data) ...@@ -188,22 +188,22 @@ static inline int qt2_setdevice(struct usb_device *dev, u8 *data)
} }
static inline int qt2_getdevice(struct usb_device *dev, u8 *data)
{
return usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),
QT_SET_GET_DEVICE, 0xc0, 0, 0,
data, 3, QT2_USB_TIMEOUT);
}
static inline int qt2_getregister(struct usb_device *dev, static inline int qt2_getregister(struct usb_device *dev,
u8 uart, u8 uart,
u8 reg, u8 reg,
u8 *data) u8 *data)
{ {
return usb_control_msg(dev, usb_rcvctrlpipe(dev, 0), int ret;
QT_SET_GET_REGISTER, 0xc0, reg,
uart, data, sizeof(*data), QT2_USB_TIMEOUT); ret = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),
QT_SET_GET_REGISTER, 0xc0, reg,
uart, data, sizeof(*data), QT2_USB_TIMEOUT);
if (ret < sizeof(*data)) {
if (ret >= 0)
ret = -EIO;
}
return ret;
} }
static inline int qt2_setregister(struct usb_device *dev, static inline int qt2_setregister(struct usb_device *dev,
...@@ -372,9 +372,11 @@ static int qt2_open(struct tty_struct *tty, struct usb_serial_port *port) ...@@ -372,9 +372,11 @@ static int qt2_open(struct tty_struct *tty, struct usb_serial_port *port)
0xc0, 0, 0xc0, 0,
device_port, data, 2, QT2_USB_TIMEOUT); device_port, data, 2, QT2_USB_TIMEOUT);
if (status < 0) { if (status < 2) {
dev_err(&port->dev, "%s - open port failed %i\n", __func__, dev_err(&port->dev, "%s - open port failed %i\n", __func__,
status); status);
if (status >= 0)
status = -EIO;
kfree(data); kfree(data);
return status; return status;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment