projects
/
wrapfs-4.14.y.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
740c938
)
usb: typec: altmode: Fix typec_altmode_get_partner sometimes returning an invalid...
author
Naoki Kiryu
<naonaokiryu2@gmail.com>
Wed, 22 Apr 2020 14:43:45 +0000
(16:43 +0200)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Wed, 29 Apr 2020 14:33:23 +0000
(16:33 +0200)
commit
0df9433fcae02215c8fd79690c134d535c7bb905
upstream.
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.
BugLink:
https://bugzilla.kernel.org/show_bug.cgi?id=206365
BugLink:
https://bugzilla.redhat.com/show_bug.cgi?id=1785972
Fixes: 5f54a85db5df ("usb: typec: Make sure an alt mode exist before getting its partner")
Cc: stable@vger.kernel.org
Signed-off-by: Naoki Kiryu <naonaokiryu2@gmail.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link:
https://lore.kernel.org/r/20200422144345.43262-1-hdegoede@redhat.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/typec/bus.c
patch
|
blob
|
history
diff --git
a/drivers/usb/typec/bus.c
b/drivers/usb/typec/bus.c
index 74cb3c2ecb3476a7c2ea9f66574c782d6018b712..c950171556d8c8e3c94af8b9beaed7bd85b57c14 100644
(file)
--- a/
drivers/usb/typec/bus.c
+++ b/
drivers/usb/typec/bus.c
@@
-192,7
+192,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);