Commit 9bdf7003 authored by Ma Ke's avatar Ma Ke Committed by Wen Zhiwei
Browse files

usb: fix reference leak in usb_new_device() 

stable inclusion
from stable-v6.6.72
commit 953dea074bc5d6e50be39daf04f49a7bb54b8750
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBQN9L

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=953dea074bc5d6e50be39daf04f49a7bb54b8750



--------------------------------

commit 0df11fa8cee5a9cf8753d4e2672bb3667138c652 upstream.

When device_add(&udev->dev) succeeds and a later call fails,
usb_new_device() does not properly call device_del(). As comment of
device_add() says, 'if device_add() succeeds, you should call
device_del() when you want to get rid of it. If device_add() has not
succeeded, use only put_device() to drop the reference count'.

Found by code review.

Cc: stable <stable@kernel.org>
Fixes: 9f8b17e6 ("USB: make usbdevices export their device nodes instead of using a separate class")
Signed-off-by: default avatarMa Ke <make_ruc2021@163.com>
Reviewed-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Link: https://lore.kernel.org/r/20241218071346.2973980-1-make_ruc2021@163.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent ad330971

drivers/usb/core/hub.c

+4 −2
Original line number Diff line number Diff line
@@ -2644,13 +2644,13 @@ int usb_new_device(struct usb_device *udev) 
		err = sysfs_create_link(&udev->dev.kobj,

				&port_dev->dev.kobj, "port");

		if (err)

			goto fail;

			goto out_del_dev;



		err = sysfs_create_link(&port_dev->dev.kobj,

				&udev->dev.kobj, "device");

		if (err) {

			sysfs_remove_link(&udev->dev.kobj, "port");

			goto fail;

			goto out_del_dev;

		}



		if (!test_and_set_bit(port1, hub->child_usage_bits))
@@ -2662,6 +2662,8 @@ int usb_new_device(struct usb_device *udev) 
	pm_runtime_put_sync_autosuspend(&udev->dev);

	return err;



out_del_dev:

	device_del(&udev->dev);

fail:

	usb_set_device_state(udev, USB_STATE_NOTATTACHED);

	pm_runtime_disable(&udev->dev);