aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Zimmerman <Paul.Zimmerman@synopsys.com>2013-04-22 17:00:16 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-04-23 13:37:55 -0400
commitddf58468e0e787b739a623594f52f9f43a188037 (patch)
treedea0c37e2d271eded00ab7696cf2852a962c4688
parenta9b3ea3dbbb54f9160465f6f1086f877e958fdcc (diff)
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>
-rw-r--r--drivers/staging/dwc2/hcd_ddma.c10
1 files 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,
217 struct dwc2_host_chan *chan; 217 struct dwc2_host_chan *chan;
218 u16 i, j, inc; 218 u16 i, j, inc;
219 219
220 if (!qh->channel) { 220 if (!hsotg) {
221 dev_err(hsotg->dev, "qh->channel = %p", qh->channel); 221 pr_err("hsotg = %p", hsotg);
222 return; 222 return;
223 } 223 }
224 224
225 if (!hsotg) { 225 if (!qh->channel) {
226 dev_err(hsotg->dev, "------hsotg = %p", hsotg); 226 dev_err(hsotg->dev, "qh->channel = %p", qh->channel);
227 return; 227 return;
228 } 228 }
229 229
230 if (!hsotg->frame_list) { 230 if (!hsotg->frame_list) {
231 dev_err(hsotg->dev, "-------hsotg->frame_list = %p", 231 dev_err(hsotg->dev, "hsotg->frame_list = %p",
232 hsotg->frame_list); 232 hsotg->frame_list);
233 return; 233 return;
234 } 234 }