This is a note to let you know that I've just added the patch titled
ARM: 7326/2: PL330: fix null pointer dereference in pl330_chan_ctrl()
to the 3.2-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
arm-7326-2-pl330-fix-null-pointer-dereference-in-pl330_chan_ctrl.patch
and it can be found in the queue-3.2 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 46e33c606af8e0caeeca374103189663d877c0d6 Mon Sep 17 00:00:00 2001
From: Javi Merino <[email protected]>
Date: Wed, 15 Feb 2012 17:36:39 +0100
Subject: ARM: 7326/2: PL330: fix null pointer dereference in pl330_chan_ctrl()
From: Javi Merino <[email protected]>
commit 46e33c606af8e0caeeca374103189663d877c0d6 upstream.
This fixes the thrd->req_running field being accessed before thrd
is checked for null. The error was introduced in
abb959f: ARM: 7237/1: PL330: Fix driver freeze
Reference: <[email protected]>
Signed-off-by: Mans Rullgard <[email protected]>
Acked-by: Javi Merino <[email protected]>
Signed-off-by: Russell King <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
arch/arm/common/pl330.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/arch/arm/common/pl330.c
+++ b/arch/arm/common/pl330.c
@@ -1496,12 +1496,13 @@ int pl330_chan_ctrl(void *ch_id, enum pl
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);
Patches currently in stable-queue which might be from [email protected] are
queue-3.2/arm-7326-2-pl330-fix-null-pointer-dereference-in-pl330_chan_ctrl.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
