Commit b0e525d7 authored by GONG Ruiqi's avatar GONG Ruiqi Committed by Greg Kroah-Hartman
Browse files

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: e56aac6e ("usb: typec: fix potential array underflow in ucsi_ccg_sync_control()")
Signed-off-by: default avatarGONG Ruiqi <gongruiqi1@huawei.com>
Reviewed-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Reviewed-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20250107015750.2778646-1-gongruiqi1@huawei.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cdef30e0

drivers/usb/typec/ucsi/ucsi_ccg.c

+2 −2
Original line number Diff line number Diff line
@@ -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;