shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 10:31:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Brennan Xavier McManus
2024-01-09 18:44:02 -05:00
committed by Greg Kroah-Hartman
parent b7a0a5cf9e
commit 5996b2b2da
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/include/nolibc/stdlib.h
View File

@@ -166,7 +166,7 @@ void *realloc(void *old_ptr, size_t new_size)
if (__builtin_expect(!ret, 0)) if (__builtin_expect(!ret, 0))
return NULL; return NULL;
memcpy(ret, heap->user_p, heap->len); memcpy(ret, heap->user_p, user_p_len);
munmap(heap, heap->len); munmap(heap, heap->len);
return ret; return ret;
} }