Skip to content

Commit

Permalink
usb: chipidea: host: fix NULL ptr dereference during shutdown
Browse files Browse the repository at this point in the history
After commit b09b522 ("usb: chipidea: implement platform shutdown
callback") and commit 43a4045 ("usb: chipidea: host: set host to
be null after hcd is freed") a NULL pointer dereference is caused
on i.MX23 during shutdown. So ensure that role is set to CI_ROLE_END and
we finish interrupt handling before the hcd is deallocated. This avoids
the NULL pointer dereference.

Suggested-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Fixes: b09b522 ("usb: chipidea: implement platform shutdown callback")
Signed-off-by: Peter Chen <peter.chen@nxp.com>
  • Loading branch information
Stefan Wahren authored and Peter Chen committed Oct 25, 2016
1 parent b760323 commit 991d5ad
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions drivers/usb/chipidea/host.c
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,8 @@ static void host_stop(struct ci_hdrc *ci)

if (hcd) {
usb_remove_hcd(hcd);
ci->role = CI_ROLE_END;
synchronize_irq(ci->irq);
usb_put_hcd(hcd);
if (ci->platdata->reg_vbus && !ci_otg_is_fsm_mode(ci) &&
(ci->platdata->flags & CI_HDRC_TURN_VBUS_EARLY_ON))
Expand Down

0 comments on commit 991d5ad

Please sign in to comment.