From: Michael Ellerman <mpe@ellerman.id.au>
Date: Thu, 29 Feb 2024 11:51:49 +0000 (+1100)
Subject: powerpc/boot: Only free if realloc() succeeds
X-Git-Tag: v5.10.225~88
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e21448a49b8b01c7b3fd2743b24d6eab5ad8108f;p=thirdparty%2Fkernel%2Fstable.git

powerpc/boot: Only free if realloc() succeeds

[ Upstream commit f2d5bccaca3e8c09c9b9c8485375f7bdbb2631d2 ]

simple_realloc() frees the original buffer (ptr) even if the
reallocation failed.

Fix it to behave like standard realloc() and only free the original
buffer if the reallocation succeeded.

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20240229115149.749264-1-mpe@ellerman.id.au
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/arch/powerpc/boot/simple_alloc.c b/arch/powerpc/boot/simple_alloc.c
index 188c4f996512a..bc99f75b8582d 100644
--- a/arch/powerpc/boot/simple_alloc.c
+++ b/arch/powerpc/boot/simple_alloc.c
@@ -114,10 +114,11 @@ static void *simple_realloc(void *ptr, unsigned long size)
 		return ptr;
 
 	new = simple_malloc(size);
-	if (new)
+	if (new) {
 		memcpy(new, ptr, p->size);
+		simple_free(ptr);
+	}
 
-	simple_free(ptr);
 	return new;
 }