summaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/f81232.c
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2013-06-10 18:29:37 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-06-10 11:00:48 -0700
commit21886725d58e92188159731c7c1aac803dd6b9dc (patch)
tree50f6e91ce8bb478b14da1ad0db15e93238521d5a /drivers/usb/serial/f81232.c
parent317ddd256b9c24b0d78fa8018f80f1e495481a10 (diff)
downloadop-kernel-dev-21886725d58e92188159731c7c1aac803dd6b9dc.zip
op-kernel-dev-21886725d58e92188159731c7c1aac803dd6b9dc.tar.gz
USB: f81232: fix device initialisation at open
Do not use uninitialised termios data to determine when to configure the device at open. This also prevents stack data from leaking to userspace. Cc: stable@vger.kernel.org Signed-off-by: Johan Hovold <jhovold@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial/f81232.c')
-rw-r--r--drivers/usb/serial/f81232.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/serial/f81232.c b/drivers/usb/serial/f81232.c
index 090b411..7d8dd5a 100644
--- a/drivers/usb/serial/f81232.c
+++ b/drivers/usb/serial/f81232.c
@@ -165,11 +165,12 @@ static void f81232_set_termios(struct tty_struct *tty,
/* FIXME - Stubbed out for now */
/* Don't change anything if nothing has changed */
- if (!tty_termios_hw_change(&tty->termios, old_termios))
+ if (old_termios && !tty_termios_hw_change(&tty->termios, old_termios))
return;
/* Do the real work here... */
- tty_termios_copy_hw(&tty->termios, old_termios);
+ if (old_termios)
+ tty_termios_copy_hw(&tty->termios, old_termios);
}
static int f81232_tiocmget(struct tty_struct *tty)
@@ -187,12 +188,11 @@ static int f81232_tiocmset(struct tty_struct *tty,
static int f81232_open(struct tty_struct *tty, struct usb_serial_port *port)
{
- struct ktermios tmp_termios;
int result;
/* Setup termios */
if (tty)
- f81232_set_termios(tty, port, &tmp_termios);
+ f81232_set_termios(tty, port, NULL);
result = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);
if (result) {
OpenPOWER on IntegriCloud