evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

USB: keyspan: fix potential null pointer dereference

Browse source 
Move control-urb dereference to after NULL-check. There is otherwise a
risk of a possible null pointer dereference.

Was largely found by using a static code analysis program called
cppcheck.

[Johan: modify commit message somewhat ]
[gkh: remove stable tag as it's not a real problem that anyone has ever hit]

Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Rickard Strandqvist 2014-05-16 17:39:13 +02:00 • committed by Greg Kroah-Hartman
parent df3ce23a56
commit d5afce82e1
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/usb/serial/keyspan.c
View file

@ -1535,14 +1535,14 @@ static int keyspan_usa26_send_setup(struct usb_serial *serial,
this_urb = p_priv->outcont_urb; this_urb = p_priv->outcont_urb;
dev_dbg(&port->dev, "%s - endpoint %d\n", __func__, usb_pipeendpoint(this_urb->pipe));
/* Make sure we have an urb then send the message */ /* Make sure we have an urb then send the message */
if (this_urb == NULL) { if (this_urb == NULL) {
dev_dbg(&port->dev, "%s - oops no urb.\n", __func__); dev_dbg(&port->dev, "%s - oops no urb.\n", __func__);
return -1; return -1;
} }
dev_dbg(&port->dev, "%s - endpoint %d\n", __func__, usb_pipeendpoint(this_urb->pipe));
/* Save reset port val for resend. /* Save reset port val for resend.
Don't overwrite resend for open/close condition. */ Don't overwrite resend for open/close condition. */
if ((reset_port + 1) > p_priv->resend_cont) if ((reset_port + 1) > p_priv->resend_cont)