* [PATCH][next] usb: typec: fix dereference before null check on adev
@ 2018-07-04 12:34 Colin King
2018-07-05 13:10 ` Heikki Krogerus
0 siblings, 1 reply; 2+ messages in thread
From: Colin King @ 2018-07-04 12:34 UTC (permalink / raw)
To: Heikki Krogerus, Greg Kroah-Hartman, linux-usb
Cc: kernel-janitors, linux-kernel
From: Colin Ian King <colin.king@canonical.com>
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: 8a37d87d72f0 ("usb: typec: Bus type for alternate modes")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
drivers/usb/typec/bus.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/typec/bus.c b/drivers/usb/typec/bus.c
index 999d7904172a..95a2b10127db 100644
--- a/drivers/usb/typec/bus.c
+++ b/drivers/usb/typec/bus.c
@@ -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);
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH][next] usb: typec: fix dereference before null check on adev
2018-07-04 12:34 [PATCH][next] usb: typec: fix dereference before null check on adev Colin King
@ 2018-07-05 13:10 ` Heikki Krogerus
0 siblings, 0 replies; 2+ messages in thread
From: Heikki Krogerus @ 2018-07-05 13:10 UTC (permalink / raw)
To: Colin King; +Cc: Greg Kroah-Hartman, linux-usb, kernel-janitors, linux-kernel
On Wed, Jul 04, 2018 at 01:34:06PM +0100, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> 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: 8a37d87d72f0 ("usb: typec: Bus type for alternate modes")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> ---
> drivers/usb/typec/bus.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/typec/bus.c b/drivers/usb/typec/bus.c
> index 999d7904172a..95a2b10127db 100644
> --- a/drivers/usb/typec/bus.c
> +++ b/drivers/usb/typec/bus.c
> @@ -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);
Thanks,
--
heikki
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-07-05 13:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-07-04 12:34 [PATCH][next] usb: typec: fix dereference before null check on adev Colin King
2018-07-05 13:10 ` Heikki Krogerus
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).