Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9920184d authored by Colin Ian King's avatar Colin Ian King Committed by Greg Kroah-Hartman
Browse files

usb: typec: fix dereference before null check on adev 



Pointer adev is being dereferenced before it is being sanity
checked with a null pointer check, hence it is possible for
a null pointer dereference to occur.  Fix this by dereferencing
adev only once it is null checked.

Detected by CoverityScan, CID#1471598 ("Dereference before null check")

Fixes: 8a37d87d ("usb: typec: Bus type for alternate modes")
Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Acked-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6f3fde68

drivers/usb/typec/bus.c

+2 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static int typec_altmode_set_state(struct typec_altmode *adev, int state) 
int typec_altmode_notify(struct typec_altmode *adev,

			 unsigned long conf, void *data)

{

	bool is_port = is_typec_port(adev->dev.parent);

	bool is_port;

	struct altmode *altmode;

	struct altmode *partner;

	int ret;
@@ -64,6 +64,7 @@ int typec_altmode_notify(struct typec_altmode *adev, 
	if (!altmode->partner)

		return -ENODEV;



	is_port = is_typec_port(adev->dev.parent);

	partner = altmode->partner;



	ret = typec_altmode_set_mux(is_port ? altmode : partner, (u8)conf);