On Tue, Feb 28, 2023 at 10:03:03AM +0100, Hans de Goede wrote:
When ucsi_init() fails, ucsi->connector is NULL, yet in case of ucsi_acpi we may still get events which cause the ucs_acpi code to call ucsi_connector_change(), which then derefs the NULL ucsi->connector pointer.
Fix this by adding a check for ucsi->connector being NULL, as is already done in ucsi_resume() for similar reasons.
Fixes: bdc62f2bae8f ("usb: typec: ucsi: Simplified registration and I/O API") Cc: stable@vger.kernel.org Signed-off-by: Hans de Goede hdegoede@redhat.com
drivers/usb/typec/ucsi/ucsi.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c index 1cf8947c6d66..e762897cb25a 100644 --- a/drivers/usb/typec/ucsi/ucsi.c +++ b/drivers/usb/typec/ucsi/ucsi.c @@ -842,7 +842,13 @@ static void ucsi_handle_connector_change(struct work_struct *work) */ void ucsi_connector_change(struct ucsi *ucsi, u8 num) {
- struct ucsi_connector *con = &ucsi->connector[num - 1];
- struct ucsi_connector *con;
- /* Check for ucsi_init() failure */
- if (!ucsi->connector)
return;- con = &ucsi->connector[num - 1];
What prevents ->connector from changing to NULL right after you check this and before you dereference it again?
thanks,
greg k-h