From ddf58468e0e787b739a623594f52f9f43a188037 Mon Sep 17 00:00:00 2001
From: Paul Zimmerman <Paul.Zimmerman@synopsys.com>
Date: Mon, 22 Apr 2013 14:00:16 -0700
Subject: [PATCH] staging: dwc2: fix potential null pointer access
We were testing hsotg pointer for null after we had already
dereferenced it
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Paul Zimmerman <paulz@synopsys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/staging/dwc2/hcd_ddma.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/dwc2/hcd_ddma.c b/drivers/staging/dwc2/hcd_ddma.c
index ab88f5069183..d2180b275f7a 100644
--- a/drivers/staging/dwc2/hcd_ddma.c
+++ b/drivers/staging/dwc2/hcd_ddma.c
@@ -217,18 +217,18 @@ static void dwc2_update_frame_list(struct dwc2_hsotg *hsotg, struct dwc2_qh *qh,
struct dwc2_host_chan *chan;
u16 i, j, inc;
- if (!qh->channel) {
- dev_err(hsotg->dev, "qh->channel = %p", qh->channel);
+ if (!hsotg) {
+ pr_err("hsotg = %p", hsotg);
return;
}
- if (!hsotg) {
- dev_err(hsotg->dev, "------hsotg = %p", hsotg);
+ if (!qh->channel) {
+ dev_err(hsotg->dev, "qh->channel = %p", qh->channel);
return;
}
if (!hsotg->frame_list) {
- dev_err(hsotg->dev, "-------hsotg->frame_list = %p",
+ dev_err(hsotg->dev, "hsotg->frame_list = %p",
hsotg->frame_list);
return;
}
--
2.34.1