[PATCH] usb: host: xhci-plat: fix NULL pointer in probe for device tree case

From	Gregory CLEMENT <gregory.clement@free-electrons.com>
Newsgroups	linux.kernel
Subject	[PATCH] usb: host: xhci-plat: fix NULL pointer in probe for device tree case
Date	2016-01-22 16:20 +0100
Message-ID	<qTLFf-5N3-5@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

During probe, in the device tree case, the data pointer associated to a
compatible is dereferenced. However, not all the compatibles are
associated to a private data pointer.

The generic-xhci and the xhci-platform don't need them, this patch adds a
test on the data pointer before accessing it, avoiding a kernel crash.

Fixes: 4efb2f694114 ("usb: host: xhci-plat: add struct xhci_plat_priv")
Cc: stable@vger.kernel.org
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
---
 drivers/usb/host/xhci-plat.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
index 770b6b088797..d39d6bf1d090 100644
--- a/drivers/usb/host/xhci-plat.c
+++ b/drivers/usb/host/xhci-plat.c
@@ -184,7 +184,8 @@ static int xhci_plat_probe(struct platform_device *pdev)
 		struct xhci_plat_priv *priv = hcd_to_xhci_priv(hcd);
 
 		/* Just copy data for now */
-		*priv = *priv_match;
+		if (priv_match)
+			*priv = *priv_match;
 	}
 
 	if (xhci_plat_type_is(hcd, XHCI_PLAT_TYPE_MARVELL_ARMADA)) {
-- 
2.5.0

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH] usb: host: xhci-plat: fix NULL pointer in probe for device tree case Gregory CLEMENT <gregory.clement@free-electrons.com> - 2016-01-22 16:20 +0100

csiph-web