Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c5d2dde authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

USB: keyspan: fix null-deref at probe 



commit b5122236bba8d7ef62153da5b55cc65d0944c61e 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 14d38f7d

drivers/usb/serial/keyspan.c

+15 −5
Original line number Diff line number Diff line
@@ -410,6 +410,8 @@ static void usa26_instat_callback(struct urb *urb) 
	}

	port = serial->port[msg->port];

	p_priv = usb_get_serial_port_data(port);

	if (!p_priv)

		goto resubmit;



	/* Update handshaking pin state information */

	old_dcd_state = p_priv->dcd_state;
@@ -420,7 +422,7 @@ static void usa26_instat_callback(struct urb *urb) 


	if (old_dcd_state != p_priv->dcd_state)

		tty_port_tty_hangup(&port->port, true);



resubmit:

	/* Resubmit urb so we continue receiving */

	err = usb_submit_urb(urb, GFP_ATOMIC);

	if (err != 0)
@@ -527,6 +529,8 @@ static void usa28_instat_callback(struct urb *urb) 
	}

	port = serial->port[msg->port];

	p_priv = usb_get_serial_port_data(port);

	if (!p_priv)

		goto resubmit;



	/* Update handshaking pin state information */

	old_dcd_state = p_priv->dcd_state;
@@ -537,7 +541,7 @@ static void usa28_instat_callback(struct urb *urb) 


	if (old_dcd_state != p_priv->dcd_state && old_dcd_state)

		tty_port_tty_hangup(&port->port, true);



resubmit:

		/* Resubmit urb so we continue receiving */

	err = usb_submit_urb(urb, GFP_ATOMIC);

	if (err != 0)
@@ -607,6 +611,8 @@ static void usa49_instat_callback(struct urb *urb) 
	}

	port = serial->port[msg->portNumber];

	p_priv = usb_get_serial_port_data(port);

	if (!p_priv)

		goto resubmit;



	/* Update handshaking pin state information */

	old_dcd_state = p_priv->dcd_state;
@@ -617,7 +623,7 @@ static void usa49_instat_callback(struct urb *urb) 


	if (old_dcd_state != p_priv->dcd_state && old_dcd_state)

		tty_port_tty_hangup(&port->port, true);



resubmit:

	/* Resubmit urb so we continue receiving */

	err = usb_submit_urb(urb, GFP_ATOMIC);

	if (err != 0)
@@ -855,6 +861,8 @@ static void usa90_instat_callback(struct urb *urb) 


	port = serial->port[0];

	p_priv = usb_get_serial_port_data(port);

	if (!p_priv)

		goto resubmit;



	/* Update handshaking pin state information */

	old_dcd_state = p_priv->dcd_state;
@@ -865,7 +873,7 @@ static void usa90_instat_callback(struct urb *urb) 


	if (old_dcd_state != p_priv->dcd_state && old_dcd_state)

		tty_port_tty_hangup(&port->port, true);



resubmit:

	/* Resubmit urb so we continue receiving */

	err = usb_submit_urb(urb, GFP_ATOMIC);

	if (err != 0)
@@ -926,6 +934,8 @@ static void usa67_instat_callback(struct urb *urb) 


	port = serial->port[msg->port];

	p_priv = usb_get_serial_port_data(port);

	if (!p_priv)

		goto resubmit;



	/* Update handshaking pin state information */

	old_dcd_state = p_priv->dcd_state;
@@ -934,7 +944,7 @@ static void usa67_instat_callback(struct urb *urb) 


	if (old_dcd_state != p_priv->dcd_state && old_dcd_state)

		tty_port_tty_hangup(&port->port, true);



resubmit:

	/* Resubmit urb so we continue receiving */

	err = usb_submit_urb(urb, GFP_ATOMIC);

	if (err != 0)