From: Bin Liu <b-liu@ti.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: <linux-usb@vger.kernel.org>
Subject: [PATCH 2/2] usb: musb: Fix a possible null-pointer dereference in musb_handle_intr_connect()
Date: Tue, 10 Dec 2019 10:54:54 -0600 [thread overview]
Message-ID: <20191210165454.13772-3-b-liu@ti.com> (raw)
In-Reply-To: <20191210165454.13772-1-b-liu@ti.com>
From: Jia-Ju Bai <baijiaju1990@gmail.com>
In musb_handle_intr_connect(), there is an if statement on line 783 to
check whether musb->hcd is NULL:
if (musb->hcd)
When musb->hcd is NULL, it is used on line 797:
musb_host_poke_root_hub(musb);
if (musb->hcd->status_urb)
Thus, a possible null-pointer dereference may occur.
To fix this bug, musb->hcd is checked before calling
musb_host_poke_root_hub().
This bug is found by a static analysis tool STCheck written by us.
Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com>
Signed-off-by: Bin Liu <b-liu@ti.com>
---
drivers/usb/musb/musb_core.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 15cca912c53e..5080fc6a0808 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -794,7 +794,8 @@ static void musb_handle_intr_connect(struct musb *musb, u8 devctl, u8 int_usb)
break;
}
- musb_host_poke_root_hub(musb);
+ if (musb->hcd)
+ musb_host_poke_root_hub(musb);
musb_dbg(musb, "CONNECT (%s) devctl %02x",
usb_otg_state_string(musb->xceiv->otg->state), devctl);
--
2.17.1
next prev parent reply other threads:[~2019-12-10 16:55 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-10 16:54 [PATCH 0/2] musb fixes for v5.5-rc2 Bin Liu
2019-12-10 16:54 ` [PATCH 1/2] usb: musb: sunxi: propagate devicetree node to glue pdev Bin Liu
2019-12-11 8:05 ` Greg Kroah-Hartman
2019-12-11 8:49 ` Johan Hovold
2019-12-11 8:51 ` Greg Kroah-Hartman
2019-12-11 8:53 ` Johan Hovold
2019-12-10 16:54 ` Bin Liu [this message]
2019-12-11 8:09 ` [PATCH 2/2] usb: musb: Fix a possible null-pointer dereference in musb_handle_intr_connect() Greg Kroah-Hartman
2019-12-11 9:10 ` Jia-Ju Bai
2019-12-11 9:20 ` Greg Kroah-Hartman
2019-12-17 8:26 ` Jia-Ju Bai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191210165454.13772-3-b-liu@ti.com \
--to=b-liu@ti.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-usb@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).