Commit c853685d authored by Fabio M. De Francesco's avatar Fabio M. De Francesco Committed by Greg Kroah-Hartman

usb: core: Unregister device on component_add() failure

Commit 8c67d06f ("usb: Link the ports to the connectors they are
attached to") creates a link to the USB Type-C connector for every new
port that is added when possible. If component_add() fails,
usb_hub_create_port_device() prints a warning but does not unregister
the device and does not return errors to the callers.

Syzbot reported a "WARNING in component_del()".

Fix this issue in usb_hub_create_port_device by calling device_unregister()
and returning the errors from component_add().

Fixes: 8c67d06f ("usb: Link the ports to the connectors they are attached to")
Reported-and-tested-by: syzbot+60df062e1c41940cae0f@syzkaller.appspotmail.com
Reviewed-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: default avatarFabio M. De Francesco <fmdefrancesco@gmail.com>
Link: https://lore.kernel.org/r/20220209164500.8769-1-fmdefrancesco@gmail.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 57bc3d3a
...@@ -602,11 +602,14 @@ int usb_hub_create_port_device(struct usb_hub *hub, int port1) ...@@ -602,11 +602,14 @@ int usb_hub_create_port_device(struct usb_hub *hub, int port1)
return retval; return retval;
} }
find_and_link_peer(hub, port1);
retval = component_add(&port_dev->dev, &connector_ops); retval = component_add(&port_dev->dev, &connector_ops);
if (retval) if (retval) {
dev_warn(&port_dev->dev, "failed to add component\n"); dev_warn(&port_dev->dev, "failed to add component\n");
device_unregister(&port_dev->dev);
return retval;
}
find_and_link_peer(hub, port1);
/* /*
* Enable runtime pm and hold a refernce that hub_configure() * Enable runtime pm and hold a refernce that hub_configure()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment