From: Guillaume Knispel <gknispel@proformatique.com>
Date: Tue, 9 Dec 2008 14:28:34 +0000 (+0100)
Subject: powerpc: Fix corruption error in rh_alloc_fixed()
X-Git-Tag: firefly_0821_release~16527^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=af4d3643864ee5fcba0c97d77a424fa0b0346f8e;p=firefly-linux-kernel-4.4.55.git

powerpc: Fix corruption error in rh_alloc_fixed()

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>
---

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)