Commit f82060da authored by Heikki Krogerus's avatar Heikki Krogerus Committed by Greg Kroah-Hartman
Browse files

usb: typec: ucsi: Don't attempt to resume the ports before they exist 

This will fix null pointer dereference that was caused by
the driver attempting to resume ports that were not yet
registered.

Fixes: e0dced9c ("usb: typec: ucsi: Resume in separate work")
Cc: <stable@vger.kernel.org>
Link: https://bugzilla.kernel.org/show_bug.cgi?id=216697


Signed-off-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20230131141518.78215-1-heikki.krogerus@linux.intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 30d09b31

drivers/usb/typec/ucsi/ucsi.c

+8 −1
Original line number Diff line number Diff line
@@ -1269,6 +1269,9 @@ static int ucsi_init(struct ucsi *ucsi) 
		con->port = NULL;

	}



	kfree(ucsi->connector);

	ucsi->connector = NULL;



err_reset:

	memset(&ucsi->cap, 0, sizeof(ucsi->cap));

	ucsi_reset_ppm(ucsi);
@@ -1300,6 +1303,7 @@ static void ucsi_resume_work(struct work_struct *work) 


int ucsi_resume(struct ucsi *ucsi)

{

	if (ucsi->connector)

		queue_work(system_long_wq, &ucsi->resume_work);

	return 0;

}
@@ -1420,6 +1424,9 @@ void ucsi_unregister(struct ucsi *ucsi) 
	/* Disable notifications */

	ucsi->ops->async_write(ucsi, UCSI_CONTROL, &cmd, sizeof(cmd));



	if (!ucsi->connector)

		return;



	for (i = 0; i < ucsi->cap.num_connectors; i++) {

		cancel_work_sync(&ucsi->connector[i].work);

		ucsi_unregister_partner(&ucsi->connector[i]);