redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

USB: opticon: fix abuse of interface data

Browse source 
Fix abuse of interface data which was used to signal device disconnect.

Use the usb_serial disconnect flag and mutex where appropriate.

Note that tiocmget does not need to check for disconnect as it does not
access the device.

Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Johan Hovold 2012-04-25 15:56:29 +02:00 committed by Greg Kroah-Hartman
parent 33f7a67e47
commit 81d5a67290
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/usb/serial/opticon.c
View file

@ -401,8 +401,6 @@ static int opticon_tiocmget(struct tty_struct *tty)
int result = 0;
dbg("%s - port %d", __func__, port->number);
if (!usb_get_intfdata(port->serial->interface))
return -ENODEV;
spin_lock_irqsave(&priv->lock, flags);
if (priv->rts)
@ -419,13 +417,13 @@ static int opticon_tiocmset(struct tty_struct *tty,
unsigned int set, unsigned int clear)
{
struct usb_serial_port *port = tty->driver_data;
struct usb_serial *serial = port->serial;
struct opticon_private *priv = usb_get_serial_data(port->serial);
unsigned long flags;
bool rts;
bool changed = false;
int ret;
if (!usb_get_intfdata(port->serial->interface))
return -ENODEV;
/* We only support RTS so we only handle that */
spin_lock_irqsave(&priv->lock, flags);
@ -441,7 +439,14 @@ static int opticon_tiocmset(struct tty_struct *tty,
return 0;
/* Send the new RTS state to the connected device */
return send_control_msg(port, CONTROL_RTS, !rts);
mutex_lock(&serial->disc_mutex);
if (!serial->disconnected)
ret = send_control_msg(port, CONTROL_RTS, !rts);
else
ret = -ENODEV;
mutex_unlock(&serial->disc_mutex);
return ret;
}
static int get_serial_info(struct opticon_private *priv,