Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-27 13:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

usb: typec: ucsi: Fix 2 unlocked ucsi_run_command calls

Browse Source 
Fix 2 unlocked ucsi_run_command calls:

1. ucsi_handle_connector_change() contains one ucsi_send_command() call,
which takes the ppm_lock for it; and one ucsi_run_command() call which
relies on the caller have taking the ppm_lock.
ucsi_handle_connector_change() does not take the lock, so the
second (ucsi_run_command) calls should also be ucsi_send_command().

2. ucsi_get_pdos() gets called from ucsi_handle_connector_change() which
does not hold the ppm_lock, so it also must use ucsi_send_command().

This commit also adds a WARN_ON(!mutex_is_locked(&ucsi->ppm_lock)); to
ucsi_run_command() to avoid similar problems getting re-introduced in
the future.

Cc: stable@vger.kernel.org
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20200809141904.4317-3-hdegoede@redhat.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Hans de Goede 2020-08-09 16:19:02 +02:00 committed by Greg Kroah-Hartman
parent 0ff0705a2e
commit 7e90057f12
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/usb/typec/ucsi/ucsi.c
View File

@ -152,6 +152,8 @@ static int ucsi_run_command(struct ucsi *ucsi, u64 command,
u8 length; u8 length;
int ret; int ret;
WARN_ON(!mutex_is_locked(&ucsi->ppm_lock));
ret = ucsi_exec_command(ucsi, command); ret = ucsi_exec_command(ucsi, command);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -502,7 +504,7 @@ static void ucsi_get_pdos(struct ucsi_connector *con, int is_partner)
command |= UCSI_GET_PDOS_PARTNER_PDO(is_partner); command |= UCSI_GET_PDOS_PARTNER_PDO(is_partner);
command |= UCSI_GET_PDOS_NUM_PDOS(UCSI_MAX_PDOS - 1); command |= UCSI_GET_PDOS_NUM_PDOS(UCSI_MAX_PDOS - 1);
command |= UCSI_GET_PDOS_SRC_PDOS; command |= UCSI_GET_PDOS_SRC_PDOS;
ret = ucsi_run_command(ucsi, command, con->src_pdos, ret = ucsi_send_command(ucsi, command, con->src_pdos,
sizeof(con->src_pdos)); sizeof(con->src_pdos));
if (ret < 0) { if (ret < 0) {
dev_err(ucsi->dev, "UCSI_GET_PDOS failed (%d)\n", ret); dev_err(ucsi->dev, "UCSI_GET_PDOS failed (%d)\n", ret);
@ -681,7 +683,7 @@ static void ucsi_handle_connector_change(struct work_struct *work)
*/ */
command = UCSI_GET_CAM_SUPPORTED; command = UCSI_GET_CAM_SUPPORTED;
command |= UCSI_CONNECTOR_NUMBER(con->num); command |= UCSI_CONNECTOR_NUMBER(con->num);
ucsi_run_command(con->ucsi, command, NULL, 0); ucsi_send_command(con->ucsi, command, NULL, 0);
} }
if (con->status.change & UCSI_CONSTAT_PARTNER_CHANGE) if (con->status.change & UCSI_CONSTAT_PARTNER_CHANGE)