tools/nolibc/stdlib: fix memory error in realloc()

BugLink: https://bugs.launchpad.net/bugs/2071621

commit 791f4641142e2aced85de082e5783b4fb0b977c2 upstream.

Pass user_p_len to memcpy() instead of heap->len to prevent realloc()
from copying an extra sizeof(heap) bytes from beyond the allocated
region.

Signed-off-by: Brennan Xavier McManus <bxmcmanus@gmail.com>
Cc: stable@vger.kernel.org
Reviewed-by: Ammar Faizi <ammarfaizi2@gnuweeb.org>
Fixes: 0e0ff63840 ("tools/nolibc/stdlib: Implement `malloc()`, `calloc()`, `realloc()` and `free()`")
Signed-off-by: Willy Tarreau <w@1wt.eu>
Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Manuel Diewald <manuel.diewald@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>

This commit is contained in:

Brennan Xavier McManus

2024-01-09 18:44:02 -05:00

committed by

Stefan Bader

parent 744dc52a06

commit 6cb8dd828d

1 changed files with 1 additions and 1 deletions

									
										tools/include/nolibc/stdlib.h
									
		+1
		-1
	
												View File
												
				@@ -185,7 +185,7 @@ void *realloc(void *old_ptr, size_t new_size)

					if (__builtin_expect(!ret, 0))

						return NULL;

					memcpy(ret, heap->user_p, heap->len);

					memcpy(ret, heap->user_p, user_p_len);

					munmap(heap, heap->len);

					return ret;

				}