]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
usb: ucsi: Add missing ppm_lock
authorChristian A. Ehrhardt <lk@c--e.de>
Sun, 21 Jan 2024 20:41:21 +0000 (21:41 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 23 Feb 2024 08:24:56 +0000 (09:24 +0100)
commit c9aed03a0a683fd1600ea92f2ad32232d4736272 upstream.

Calling ->sync_write must be done while holding the PPM lock as
the mailbox logic does not support concurrent commands.

At least since the addition of partner task this means that
ucsi_acknowledge_connector_change should be called with the
PPM lock held as it calls ->sync_write.

Thus protect the only call to ucsi_acknowledge_connector_change
with the PPM. All other calls to ->sync_write already happen
under the PPM lock.

Fixes: b9aa02ca39a4 ("usb: typec: ucsi: Add polling mechanism for partner tasks like alt mode checking")
Cc: stable@vger.kernel.org
Signed-off-by: "Christian A. Ehrhardt" <lk@c--e.de>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20240121204123.275441-2-lk@c--e.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/typec/ucsi/ucsi.c

index 61b64558f96c57f528d54efba0a71d3ea67a033d..8f9dff993b3da5a3aa97c5e948fc15379d1798b3 100644 (file)
@@ -935,7 +935,9 @@ static void ucsi_handle_connector_change(struct work_struct *work)
 
        clear_bit(EVENT_PENDING, &con->ucsi->flags);
 
+       mutex_lock(&ucsi->ppm_lock);
        ret = ucsi_acknowledge_connector_change(ucsi);
+       mutex_unlock(&ucsi->ppm_lock);
        if (ret)
                dev_err(ucsi->dev, "%s: ACK failed (%d)", __func__, ret);