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

Commit 48d5548f authored by Dan Carpenter's avatar Dan Carpenter Committed by John W. Linville
Browse files

orinoco_usb: potential null dereference 



Smatch complains that "upriv->read_urb" gets dereferenced before
checking for NULL.  It turns out that it's possible for
"upriv->read_urb" to be NULL so I added checks around the dereferences.

Also I remove an "if (upriv->bap_buf != NULL)" check because
"kfree(NULL) is OK.

Signed-off-by: default avatarDan Carpenter <error27@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 9171acc7

drivers/net/wireless/orinoco/orinoco_usb.c

+5 −5
Original line number Diff line number Diff line
@@ -1502,16 +1502,16 @@ static inline void ezusb_delete(struct ezusb_priv *upriv) 
	    ezusb_ctx_complete(list_entry(item,

					  struct request_context, list));



	if (upriv->read_urb->status == -EINPROGRESS)

	if (upriv->read_urb && upriv->read_urb->status == -EINPROGRESS)

		printk(KERN_ERR PFX "Some URB in progress\n");



	mutex_unlock(&upriv->mtx);



	if (upriv->read_urb) {

		kfree(upriv->read_urb->transfer_buffer);

	if (upriv->bap_buf != NULL)

		kfree(upriv->bap_buf);

	if (upriv->read_urb != NULL)

		usb_free_urb(upriv->read_urb);

	}

	kfree(upriv->bap_buf);

	if (upriv->dev) {

		struct orinoco_private *priv = ndev_priv(upriv->dev);

		orinoco_if_del(priv);