Commit 452bb6e2 authored Apr 07, 2022 by Hangyu Hua Committed by Greg Kroah-Hartman May 12, 2022

usb: misc: fix improper handling of refcount in uss720_probe()



commit 0a96fa640dc928da9eaa46a22c46521b037b78ad upstream.

usb_put_dev shouldn't be called when uss720_probe succeeds because of
priv->usbdev. At the same time, priv->usbdev shouldn't be set to NULL
before destroy_priv in uss720_disconnect because usb_put_dev is in
destroy_priv.

Fix this by moving priv->usbdev = NULL after usb_put_dev.

Fixes: dcb4b8ad6a44 ("misc/uss720: fix memory leak in uss720_probe")
Cc: stable <stable@kernel.org>
Reviewed-by: Dongliang Mu <mudongliangabcd@gmail.com>
Signed-off-by: Hangyu Hua <hbh25y@gmail.com>
Link: https://lore.kernel.org/r/20220407024001.11761-1-hbh25y@gmail.com


Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent cddbb17f

drivers/usb/misc/uss720.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -87,6 +87,7 @@ static void destroy_priv(struct kref *kref)

		dev_dbg(&priv->usbdev->dev, "destroying priv datastructure\n");
		usb_put_dev(priv->usbdev);
		priv->usbdev = NULL;
		kfree(priv);
		}

		@@ -750,7 +751,6 @@ static int uss720_probe(struct usb_interface *intf,
		parport_announce_port(pp);

		usb_set_intfdata(intf, pp);
		usb_put_dev(usbdev);
		return 0;

		probe_abort:
		@@ -770,7 +770,6 @@ static void uss720_disconnect(struct usb_interface *intf)
		if (pp) {
		priv = pp->private_data;
		usbdev = priv->usbdev;
		priv->usbdev = NULL;
		priv->pp = NULL;
		dev_dbg(&intf->dev, "parport_remove_port\n");
		parport_remove_port(pp);