shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 10:31:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
commit b0e525d7a22ea350e75e2aec22e47fcfafa4cacd upstream.

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>
[Minor context change fixed.]
Signed-off-by: Bin Lan <bin.lan.cn@windriver.com>
Signed-off-by: He Zhe <zhe.he@windriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
GONG Ruiqi
2025-01-07 09:57:50 +08:00
committed by Greg Kroah-Hartman
parent e44189455c
commit 0529646acd
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/usb/typec/ucsi/ucsi_ccg.c
View File

@@ -587,7 +587,7 @@ static int ucsi_ccg_sync_write(struct ucsi *ucsi, unsigned int offset,
UCSI_CMD_CONNECTOR_MASK; UCSI_CMD_CONNECTOR_MASK;
if (con_index == 0) { if (con_index == 0) {
ret = -EINVAL; ret = -EINVAL;
goto unlock; goto err_put;
} }
con = &uc->ucsi->connector[con_index - 1]; con = &uc->ucsi->connector[con_index - 1];
ucsi_ccg_update_set_new_cam_cmd(uc, con, (u64 *)val); ucsi_ccg_update_set_new_cam_cmd(uc, con, (u64 *)val);
@@ -603,8 +603,8 @@ static int ucsi_ccg_sync_write(struct ucsi *ucsi, unsigned int offset,
err_clear_bit: err_clear_bit:
clear_bit(DEV_CMD_PENDING, &uc->flags); clear_bit(DEV_CMD_PENDING, &uc->flags);
err_put:
pm_runtime_put_sync(uc->dev); pm_runtime_put_sync(uc->dev);
unlock:
mutex_unlock(&uc->lock); mutex_unlock(&uc->lock);
return ret; return ret;