summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorGuillaume Knispel <gknispel@proformatique.com>2008-12-09 15:28:34 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2009-01-14 09:44:01 -0800
commit89b2d02846a92d7fbf0c4717a037793d166f6dd7 (patch)
treefda081f88a16d729085bd774a19b42bbd921ad7a /arch
parent857b603afbf74abcfc1bcb784a57c25d49831aff (diff)
downloadlinux-stable-89b2d02846a92d7fbf0c4717a037793d166f6dd7.tar.gz
linux-stable-89b2d02846a92d7fbf0c4717a037793d166f6dd7.tar.bz2
linux-stable-89b2d02846a92d7fbf0c4717a037793d166f6dd7.zip
powerpc: Fix corruption error in rh_alloc_fixed()
commit af4d3643864ee5fcba0c97d77a424fa0b0346f8e upstream. There is an error in rh_alloc_fixed() of the Remote Heap code: If there is at least one free block blk won't be NULL at the end of the search loop, so -ENOMEM won't be returned and the else branch of "if (bs == s || be == e)" will be taken, corrupting the management structures. Signed-off-by: Guillaume Knispel <gknispel@proformatique.com> Acked-by: Timur Tabi <timur@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/lib/rheap.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/lib/rheap.c b/arch/powerpc/lib/rheap.c
index 29b2941cada0..45907c1dae66 100644
--- a/arch/powerpc/lib/rheap.c
+++ b/arch/powerpc/lib/rheap.c
@@ -556,6 +556,7 @@ unsigned long rh_alloc_fixed(rh_info_t * info, unsigned long start, int size, co
be = blk->start + blk->size;
if (s >= bs && e <= be)
break;
+ blk = NULL;
}
if (blk == NULL)