[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1326458191-23492-1-git-send-email-mans.rullgard@linaro.org>
Date: Fri, 13 Jan 2012 12:36:31 +0000
From: Mans Rullgard <mans.rullgard@...aro.org>
To: linux-arm-kernel@...ts.infradead.org
Cc: linaro-dev@...ts.linaro.org, patches@...aro.org,
Russell King <linux@....linux.org.uk>,
Jassi Brar <jaswinder.singh@...aro.org>,
Javi Merino <javi.merino@....com>,
Lucas De Marchi <lucas.demarchi@...fusion.mobi>,
linux-kernel@...r.kernel.org
Subject: [PATCH] ARM: pl330: fix null pointer dereference in pl330_chan_ctrl()
This fixes the thrd->req_running field being accessed before thrd
is checked for null. The error was introduced in abb959f.
Signed-off-by: Mans Rullgard <mans.rullgard@...aro.org>
---
arch/arm/common/pl330.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/arch/arm/common/pl330.c b/arch/arm/common/pl330.c
index 8d8df74..67abef5 100644
--- a/arch/arm/common/pl330.c
+++ b/arch/arm/common/pl330.c
@@ -1496,12 +1496,13 @@ int pl330_chan_ctrl(void *ch_id, enum pl330_chan_op op)
struct pl330_thread *thrd = ch_id;
struct pl330_dmac *pl330;
unsigned long flags;
- int ret = 0, active = thrd->req_running;
+ int ret = 0, active;
if (!thrd || thrd->free || thrd->dmac->state == DYING)
return -EINVAL;
pl330 = thrd->dmac;
+ active = thrd->req_running;
spin_lock_irqsave(&pl330->lock, flags);
--
1.7.8.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists