Commit a6962606 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman

USB: keyspan: fix null-deref at probe

commit b5122236 upstream.

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>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a1fec587
...@@ -421,6 +421,8 @@ static void usa26_instat_callback(struct urb *urb) ...@@ -421,6 +421,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;
...@@ -431,7 +433,7 @@ static void usa26_instat_callback(struct urb *urb) ...@@ -431,7 +433,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)
...@@ -541,6 +543,8 @@ static void usa28_instat_callback(struct urb *urb) ...@@ -541,6 +543,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;
...@@ -551,7 +555,7 @@ static void usa28_instat_callback(struct urb *urb) ...@@ -551,7 +555,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)
...@@ -624,6 +628,8 @@ static void usa49_instat_callback(struct urb *urb) ...@@ -624,6 +628,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;
...@@ -634,7 +640,7 @@ static void usa49_instat_callback(struct urb *urb) ...@@ -634,7 +640,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)
...@@ -872,6 +878,8 @@ static void usa90_instat_callback(struct urb *urb) ...@@ -872,6 +878,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;
...@@ -882,7 +890,7 @@ static void usa90_instat_callback(struct urb *urb) ...@@ -882,7 +890,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)
...@@ -943,6 +951,8 @@ static void usa67_instat_callback(struct urb *urb) ...@@ -943,6 +951,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;
...@@ -951,7 +961,7 @@ static void usa67_instat_callback(struct urb *urb) ...@@ -951,7 +961,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