[PATCH] usb: chipidea: core: check before accessing ci_role in ci_role_show

[Michael Thalmeier]

ci_role BUGs when the role is >= CI_ROLE_END.
This is the case while the role is changing.

Signed-off-by: Michael Thalmeier 
---
 drivers/usb/chipidea/core.c | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c
index 9e217b1..fe4fe24 100644
--- a/drivers/usb/chipidea/core.c
+++ b/drivers/usb/chipidea/core.c
@@ -843,7 +843,10 @@ static ssize_t ci_role_show(struct device *dev, struct 
device_attribute *attr,
 {
struct ci_hdrc *ci = dev_get_drvdata(dev);
 
-   return sprintf(buf, "%s\n", ci_role(ci)->name);
+   if (ci->role != CI_ROLE_END)
+   return sprintf(buf, "%s\n", ci_role(ci)->name);
+
+   return 0;
 }
 
 static ssize_t ci_role_store(struct device *dev,
-- 
2.9.2

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] usb: chipidea: debug: check before accessing ci_role

[Michael Thalmeier]

On Fri, May 19, 2017 at 09:15:40AM +0800, Peter Chen wrote:
> On Thu, May 18, 2017 at 04:14:14PM +0200, Michael Thalmeier wrote:
> > ci_role BUGs when the role is >= CI_ROLE_END.
> > 
> > Signed-off-by: Michael Thalmeier 
> > ---
> >  drivers/usb/chipidea/debug.c | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> > 
> > diff --git a/drivers/usb/chipidea/debug.c b/drivers/usb/chipidea/debug.c
> > index 6d23eed..1c31e8a 100644
> > --- a/drivers/usb/chipidea/debug.c
> > +++ b/drivers/usb/chipidea/debug.c
> > @@ -294,7 +294,8 @@ static int ci_role_show(struct seq_file *s, void *data)
> >  {
> > struct ci_hdrc *ci = s->private;
> >  
> > -   seq_printf(s, "%s\n", ci_role(ci)->name);
> > +   if (ci->role != CI_ROLE_END)
> > +   seq_printf(s, "%s\n", ci_role(ci)->name);
> >  
> > return 0;
> >  }
> 
> By the way, how can you trigger this issue?

It is quite easy to trigger.
I have an USB OTG adapter cable connected to the micro-USB port of my device.
When the cable is connected, the port has the "host" role. When
disconnected, the role changes to "gadget".

When polling (1 second interval) the role file while
connecting/disconnecting the USB OTG cable, the error occurs within
the first few tries.

> Do you mind sending another patch to fix the same issue for ci_role_show
> at core.c?

I did not see, that there is now another place this is used. Will send
a patch later.

> 
> -- 
> 
> Best Regards,
> Peter Chen

Regards,
Michael
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] usb: chipidea: debug: check before accessing ci_role

[Michael Thalmeier]

ci_role BUGs when the role is >= CI_ROLE_END.

Signed-off-by: Michael Thalmeier 
---
 drivers/usb/chipidea/debug.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/chipidea/debug.c b/drivers/usb/chipidea/debug.c
index 6d23eed..1c31e8a 100644
--- a/drivers/usb/chipidea/debug.c
+++ b/drivers/usb/chipidea/debug.c
@@ -294,7 +294,8 @@ static int ci_role_show(struct seq_file *s, void *data)
 {
struct ci_hdrc *ci = s->private;
 
-   seq_printf(s, "%s\n", ci_role(ci)->name);
+   if (ci->role != CI_ROLE_END)
+   seq_printf(s, "%s\n", ci_role(ci)->name);
 
return 0;
 }
-- 
2.9.2

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html