usb: typec: Fix error pointer dereference

[PATCH] usb: typec: Fix error pointer dereference

Posted by Ethan Tidmore 1 month, 2 weeks ago

The variable tps->partner is checked for an error pointer and then if it
is, it sends an error message but does not return and then immediately
dereferenced a few lines below:

tps->partner = typec_register_partner(tps->port, &desc);
if (IS_ERR(tps->partner))
	dev_warn(tps->dev, "%s: failed to register partnet\n", __func__);

if (desc.identity) {
	typec_partner_set_identity(tps->partner);
	cd321x->cur_partner_identity = st.partner_identity;
}

Add early return and fix spelling mistake in error message.

Detected by Smatch:
drivers/usb/typec/tipd/core.c:827 cd321x_update_work() error:
'tps->partner' dereferencing possible ERR_PTR()

Fixes: 82432bbfb9e83 ("usb: typec: tipd: Handle mode transitions for CD321x")
Signed-off-by: Ethan Tidmore <ethantidmore06@gmail.com>
---
 drivers/usb/typec/tipd/core.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c
index e2b26af2b84a..43faec794b95 100644
--- a/drivers/usb/typec/tipd/core.c
+++ b/drivers/usb/typec/tipd/core.c
@@ -820,8 +820,10 @@ static void cd321x_update_work(struct work_struct *work)
 			desc.identity = &st.partner_identity;
 
 		tps->partner = typec_register_partner(tps->port, &desc);
-		if (IS_ERR(tps->partner))
-			dev_warn(tps->dev, "%s: failed to register partnet\n", __func__);
+		if (IS_ERR(tps->partner)) {
+			dev_warn(tps->dev, "%s: failed to register partner\n", __func__);
+			return;
+		}
 
 		if (desc.identity) {
 			typec_partner_set_identity(tps->partner);
-- 
2.53.0

Re: [PATCH] usb: typec: Fix error pointer dereference

Posted by Heikki Krogerus 1 month, 1 week ago

Wed, Feb 18, 2026 at 03:46:21PM -0600, Ethan Tidmore wrote:
> The variable tps->partner is checked for an error pointer and then if it
> is, it sends an error message but does not return and then immediately
> dereferenced a few lines below:
> 
> tps->partner = typec_register_partner(tps->port, &desc);
> if (IS_ERR(tps->partner))
> 	dev_warn(tps->dev, "%s: failed to register partnet\n", __func__);
> 
> if (desc.identity) {
> 	typec_partner_set_identity(tps->partner);
> 	cd321x->cur_partner_identity = st.partner_identity;
> }
> 
> Add early return and fix spelling mistake in error message.
> 
> Detected by Smatch:
> drivers/usb/typec/tipd/core.c:827 cd321x_update_work() error:
> 'tps->partner' dereferencing possible ERR_PTR()
> 
> Fixes: 82432bbfb9e83 ("usb: typec: tipd: Handle mode transitions for CD321x")
> Signed-off-by: Ethan Tidmore <ethantidmore06@gmail.com>

Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>

> ---
>  drivers/usb/typec/tipd/core.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c
> index e2b26af2b84a..43faec794b95 100644
> --- a/drivers/usb/typec/tipd/core.c
> +++ b/drivers/usb/typec/tipd/core.c
> @@ -820,8 +820,10 @@ static void cd321x_update_work(struct work_struct *work)
>  			desc.identity = &st.partner_identity;
>  
>  		tps->partner = typec_register_partner(tps->port, &desc);
> -		if (IS_ERR(tps->partner))
> -			dev_warn(tps->dev, "%s: failed to register partnet\n", __func__);
> +		if (IS_ERR(tps->partner)) {
> +			dev_warn(tps->dev, "%s: failed to register partner\n", __func__);
> +			return;
> +		}
>  
>  		if (desc.identity) {
>  			typec_partner_set_identity(tps->partner);
> -- 
> 2.53.0

-- 
heikki