Commit b5122236 authored by Johan Hovold's avatar Johan Hovold

USB: keyspan: fix null-deref at probe

Fix null-pointer dereference during probe if the interface-status
completion handler is called before the individual ports have been set
up.

Fixes: f79b2d0f ("USB: keyspan: fix NULL-pointer dereferences and
memory leaks")
Reported-by: default avatarRichard <richjunk@pacbell.net>
Tested-by: default avatarRichard <richjunk@pacbell.net>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parent 90441b4d
...@@ -410,6 +410,8 @@ static void usa26_instat_callback(struct urb *urb) ...@@ -410,6 +410,8 @@ static void usa26_instat_callback(struct urb *urb)
} }
port = serial->port[msg->port]; port = serial->port[msg->port];
p_priv = usb_get_serial_port_data(port); p_priv = usb_get_serial_port_data(port);
if (!p_priv)
goto resubmit;
/* Update handshaking pin state information */ /* Update handshaking pin state information */
old_dcd_state = p_priv->dcd_state; old_dcd_state = p_priv->dcd_state;
...@@ -420,7 +422,7 @@ static void usa26_instat_callback(struct urb *urb) ...@@ -420,7 +422,7 @@ static void usa26_instat_callback(struct urb *urb)
if (old_dcd_state != p_priv->dcd_state) if (old_dcd_state != p_priv->dcd_state)
tty_port_tty_hangup(&port->port, true); tty_port_tty_hangup(&port->port, true);
resubmit:
/* Resubmit urb so we continue receiving */ /* Resubmit urb so we continue receiving */
err = usb_submit_urb(urb, GFP_ATOMIC); err = usb_submit_urb(urb, GFP_ATOMIC);
if (err != 0) if (err != 0)
...@@ -527,6 +529,8 @@ static void usa28_instat_callback(struct urb *urb) ...@@ -527,6 +529,8 @@ static void usa28_instat_callback(struct urb *urb)
} }
port = serial->port[msg->port]; port = serial->port[msg->port];
p_priv = usb_get_serial_port_data(port); p_priv = usb_get_serial_port_data(port);
if (!p_priv)
goto resubmit;
/* Update handshaking pin state information */ /* Update handshaking pin state information */
old_dcd_state = p_priv->dcd_state; old_dcd_state = p_priv->dcd_state;
...@@ -537,7 +541,7 @@ static void usa28_instat_callback(struct urb *urb) ...@@ -537,7 +541,7 @@ static void usa28_instat_callback(struct urb *urb)
if (old_dcd_state != p_priv->dcd_state && old_dcd_state) if (old_dcd_state != p_priv->dcd_state && old_dcd_state)
tty_port_tty_hangup(&port->port, true); tty_port_tty_hangup(&port->port, true);
resubmit:
/* Resubmit urb so we continue receiving */ /* Resubmit urb so we continue receiving */
err = usb_submit_urb(urb, GFP_ATOMIC); err = usb_submit_urb(urb, GFP_ATOMIC);
if (err != 0) if (err != 0)
...@@ -607,6 +611,8 @@ static void usa49_instat_callback(struct urb *urb) ...@@ -607,6 +611,8 @@ static void usa49_instat_callback(struct urb *urb)
} }
port = serial->port[msg->portNumber]; port = serial->port[msg->portNumber];
p_priv = usb_get_serial_port_data(port); p_priv = usb_get_serial_port_data(port);
if (!p_priv)
goto resubmit;
/* Update handshaking pin state information */ /* Update handshaking pin state information */
old_dcd_state = p_priv->dcd_state; old_dcd_state = p_priv->dcd_state;
...@@ -617,7 +623,7 @@ static void usa49_instat_callback(struct urb *urb) ...@@ -617,7 +623,7 @@ static void usa49_instat_callback(struct urb *urb)
if (old_dcd_state != p_priv->dcd_state && old_dcd_state) if (old_dcd_state != p_priv->dcd_state && old_dcd_state)
tty_port_tty_hangup(&port->port, true); tty_port_tty_hangup(&port->port, true);
resubmit:
/* Resubmit urb so we continue receiving */ /* Resubmit urb so we continue receiving */
err = usb_submit_urb(urb, GFP_ATOMIC); err = usb_submit_urb(urb, GFP_ATOMIC);
if (err != 0) if (err != 0)
...@@ -855,6 +861,8 @@ static void usa90_instat_callback(struct urb *urb) ...@@ -855,6 +861,8 @@ static void usa90_instat_callback(struct urb *urb)
port = serial->port[0]; port = serial->port[0];
p_priv = usb_get_serial_port_data(port); p_priv = usb_get_serial_port_data(port);
if (!p_priv)
goto resubmit;
/* Update handshaking pin state information */ /* Update handshaking pin state information */
old_dcd_state = p_priv->dcd_state; old_dcd_state = p_priv->dcd_state;
...@@ -865,7 +873,7 @@ static void usa90_instat_callback(struct urb *urb) ...@@ -865,7 +873,7 @@ static void usa90_instat_callback(struct urb *urb)
if (old_dcd_state != p_priv->dcd_state && old_dcd_state) if (old_dcd_state != p_priv->dcd_state && old_dcd_state)
tty_port_tty_hangup(&port->port, true); tty_port_tty_hangup(&port->port, true);
resubmit:
/* Resubmit urb so we continue receiving */ /* Resubmit urb so we continue receiving */
err = usb_submit_urb(urb, GFP_ATOMIC); err = usb_submit_urb(urb, GFP_ATOMIC);
if (err != 0) if (err != 0)
...@@ -926,6 +934,8 @@ static void usa67_instat_callback(struct urb *urb) ...@@ -926,6 +934,8 @@ static void usa67_instat_callback(struct urb *urb)
port = serial->port[msg->port]; port = serial->port[msg->port];
p_priv = usb_get_serial_port_data(port); p_priv = usb_get_serial_port_data(port);
if (!p_priv)
goto resubmit;
/* Update handshaking pin state information */ /* Update handshaking pin state information */
old_dcd_state = p_priv->dcd_state; old_dcd_state = p_priv->dcd_state;
...@@ -934,7 +944,7 @@ static void usa67_instat_callback(struct urb *urb) ...@@ -934,7 +944,7 @@ static void usa67_instat_callback(struct urb *urb)
if (old_dcd_state != p_priv->dcd_state && old_dcd_state) if (old_dcd_state != p_priv->dcd_state && old_dcd_state)
tty_port_tty_hangup(&port->port, true); tty_port_tty_hangup(&port->port, true);
resubmit:
/* Resubmit urb so we continue receiving */ /* Resubmit urb so we continue receiving */
err = usb_submit_urb(urb, GFP_ATOMIC); err = usb_submit_urb(urb, GFP_ATOMIC);
if (err != 0) if (err != 0)
......
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