usb: typec: fix potential array underflow in ucsi_ccg_sync_control()
PATCH 1/2 usb: typec: fix potential array underflow in ucsi_ccg_sync_control()
From: Dan Carpenter <[email protected]>
[ Upstream commit e56aac6e5a25630645607b6856d4b2a17b2311a5 ]
The "command" variable can be controlled by the user via debugfs. The worry is that if con_index is zero then "&uc->ucsi->connector[con_index
- 1]" would be an array underflow.
[Minor context change fixed.
13f2ec3115c8 ("usb: typec: ucsi: simplify command sending API") rename ucsi_ccg_sync_write to ucsi_ccg_sync_control in v6.11, so this patch is applied in ucsi_ccg_sync_write in v6.6.]
---
Build test passed.
--- drivers/usb/typec/ucsi/ucsi_ccg.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/usb/typec/ucsi/ucsi_ccg.c +5 -0
@@ -585,6 +585,10 @@ static int ucsi_ccg_sync_write(struct ucsi *ucsi, unsigned int offset, uc->has_multiple_dp) { con_index = (uc->last_cmd_sent >>16 ) &UCSI_CMD_CONNECTOR_MASK ; +if (con_index ==0 ) { + ret = -EINVAL ; + goto unlock; + } con = &uc->ucsi->connector[con_index -1 ];ucsi_ccg_update_set_new_cam_cmd (uc, con, (u64 *)val); }
@@ -600,6 +604,7 @@ static int ucsi_ccg_sync_write(struct ucsi *ucsi, unsigned int offset, err_clear_bit:clear_bit (DEV_CMD_PENDING , &uc->flags);pm_runtime_put_sync (uc->dev); +unlock:mutex_unlock (&uc->lock);return ret;
Signature · 1 line
2.34.1
PATCH 2/2 usb: typec: fix pm usage counter imbalance in ucsi_ccg_sync_control()
From: GONG Ruiqi <[email protected]>
[ Upstream commit b0e525d7a22ea350e75e2aec22e47fcfafa4cacd ]
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.
---
Build test passed.
--- drivers/usb/typec/ucsi/ucsi_ccg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/usb/typec/ucsi/ucsi_ccg.c +2 -2
@@ -587,7 +587,7 @@ static int ucsi_ccg_sync_write(struct ucsi *ucsi, unsigned int offset,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, (u64 *)val);
@@ -603,8 +603,8 @@ static int ucsi_ccg_sync_write(struct ucsi *ucsi, unsigned int offset, err_clear_bit:clear_bit (DEV_CMD_PENDING , &uc->flags); +err_put:pm_runtime_put_sync (uc->dev); -unlock:mutex_unlock (&uc->lock);return ret;
Signature · 1 line
2.34.1
Sasha Levin
maintainerRe: [PATCH 6.6.y 2/2] usb: typec: fix pm usage counter imbalance in ucsi_ccg_sync_control()
[ Sasha's backport helper bot ]
Hi,
✅ All tests passed successfully. No issues detected. No action required from the submitter.
The upstream commit SHA1 provided is correct: b0e525d7a22ea350e75e2aec22e47fcfafa4cacd
WARNING: Author mismatch between patch and upstream commit:
Backport author: [email protected]
Commit author: GONG Ruiqi<[email protected]>
Status in newer kernel trees:
6.14.y | Present (exact SHA1) 6.13.y | Present (exact SHA1) 6.12.y | Present (different SHA1: 976544bdb40a)
Note: The patch differs from the upstream commit:
---
1: b0e525d7a22ea < -: ------------- usb: typec: fix pm usage counter imbalance in ucsi_ccg_sync_control() -: ------------- > 1: 4cf6fea3b1723 usb: typec: fix pm usage counter imbalance in ucsi_ccg_sync_control()
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-6.12.y | Success | Success |
Sasha Levin
maintainer[ Sasha's backport helper bot ]
Hi,
Summary of potential issues:
⚠️ Found follow-up fixes in mainline
The upstream commit SHA1 provided is correct: e56aac6e5a25630645607b6856d4b2a17b2311a5
WARNING: Author mismatch between patch and upstream commit:
Backport author: [email protected]
Commit author: Dan Carpenter<[email protected]>
Status in newer kernel trees:
6.14.y | Present (exact SHA1) 6.13.y | Present (exact SHA1) 6.12.y | Present (different SHA1: 56971710cd54)
Found fixes commits:b0e525d7a22e usb: typec: fix pm usage counter imbalance in ucsi_ccg_sync_control()
Note: The patch differs from the upstream commit:
---
1: e56aac6e5a256 < -: ------------- usb: typec: fix potential array underflow in ucsi_ccg_sync_control() -: ------------- > 1: 0d00efada893e usb: typec: fix potential array underflow in ucsi_ccg_sync_control()
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-6.6.y | Success | Success |