Skip to contentSkip to conversation

usb: typec: altmode: Fix typec_altmode_get_partner sometimes returning an invalid pointer

PATCH In review Hans de Goede 2 participants 2 messages Apr 22, 2020 – Apr 23, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 usb: typec: altmode: Fix typec_altmode_get_partner sometimes returning an invalid pointer

From: Naoki Kiryu <[email protected]>

Before this commit, typec_altmode_get_partner would return a const struct typec_altmode * pointing to address 0x08 when to_altmode(adev)->partner was NULL.

Add a check for to_altmode(adev)->partner being NULL to fix this.

Fixes 5f54a85db5df ("usb: typec: Make sure an alt mode exist before getting its partner")
---
 drivers/usb/typec/bus.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/usb/typec/bus.c +4 -1
index c823122f9cb7..e8ddb81cb6df 100644
@@ -198,7 +198,10 @@ EXPORT_SYMBOL_GPL(typec_altmode_vdm);
 const struct typec_altmode *
 typec_altmode_get_partner(struct typec_altmode *adev)
 {
-	return adev ? &to_altmode(adev)->partner->adev : NULL;
+	if (!adev || !to_altmode(adev)->partner)
+		return NULL;
+
+	return &to_altmode(adev)->partner->adev;
 }
 EXPORT_SYMBOL_GPL(typec_altmode_get_partner);
 
Signature · 1 line
2.26.0
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 6 lines · Hans de Goede

From: Naoki Kiryu <[email protected]>

Before this commit, typec_altmode_get_partner would return a const struct typec_altmode * pointing to address 0x08 when to_altmode(adev)->partner was NULL.

Quoted 8 lines

Add a check for to_altmode(adev)->partner being NULL to fix this.

Fixes 5f54a85db5df ("usb: typec: Make sure an alt mode exist before getting its partner")
Quoted 22 lines
---
 drivers/usb/typec/bus.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/usb/typec/bus.c +4 -1
index c823122f9cb7..e8ddb81cb6df 100644
@@ -198,7 +198,10 @@ EXPORT_SYMBOL_GPL(typec_altmode_vdm);
 const struct typec_altmode *
 typec_altmode_get_partner(struct typec_altmode *adev)
 {
-	return adev ? &to_altmode(adev)->partner->adev : NULL;
+	if (!adev || !to_altmode(adev)->partner)
+		return NULL;
+
+	return &to_altmode(adev)->partner->adev;
 }
 EXPORT_SYMBOL_GPL(typec_altmode_get_partner);
 
Signature · 1 line
2.26.0

thanks,

Signature · 1 line
heikki