usb: typec: fix pm usage counter imbalance in ucsi_ccg_sync_control()

The error handling for the case `con_index == 0` should involve dropping
the pm usage counter, as ucsi_ccg_sync_control() gets it at the
beginning. Fix it.

Cc: stable <stable@kernel.org>
Fixes: e56aac6e5a25 ("usb: typec: fix potential array underflow in ucsi_ccg_sync_control()")
Signed-off-by: GONG Ruiqi <gongruiqi1@huawei.com>
Reviewed-by: Dan Carpenter <dan.carpenter@linaro.org>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20250107015750.2778646-1-gongruiqi1@huawei.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/typec/ucsi/ucsi_ccg.c b/drivers/usb/typec/ucsi/ucsi_ccg.c
index fcb8e61136cfd77029e5b91a02dd61c08232c1fa..740171f24ef9fae9abdb52d7995abe692e0a7623 100644 (file)
--- a/drivers/usb/typec/ucsi/ucsi_ccg.c
+++ b/drivers/usb/typec/ucsi/ucsi_ccg.c
@@ -646,7 +646,7 @@ static int ucsi_ccg_sync_control(struct ucsi *ucsi, u64 command)
                        UCSI_CMD_CONNECTOR_MASK;
                if (con_index == 0) {
                        ret = -EINVAL;
-                       goto unlock;
+                       goto err_put;
                }
                con = &uc->ucsi->connector[con_index - 1];
                ucsi_ccg_update_set_new_cam_cmd(uc, con, &command);
@@ -654,8 +654,8 @@ static int ucsi_ccg_sync_control(struct ucsi *ucsi, u64 command)
 
        ret = ucsi_sync_control_common(ucsi, command);
 
+err_put:
        pm_runtime_put_sync(uc->dev);
-unlock:
        mutex_unlock(&uc->lock);
 
        return ret;