git: 149cebf08dd5 - stable/15 - malloc: Fix realloc() for large allocations
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 06 Nov 2026 19:55:01 UTC
The branch stable/15 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=149cebf08dd535e438d87f247bed25d0534713c6
commit 149cebf08dd535e438d87f247bed25d0534713c6
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2026-10-22 16:41:04 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2026-11-06 15:52:19 +0000
malloc: Fix realloc() for large allocations
min() truncates its parameters.
MFC after: 1 week
Sponsored by: The FreeBSD Foundation
(cherry picked from commit ca16e7a4920415bf9d09cf76bd2c3cda7447c098)
---
sys/kern/kern_malloc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c
index ffc260781d60..0a6a39c1734a 100644
--- a/sys/kern/kern_malloc.c
+++ b/sys/kern/kern_malloc.c
@@ -981,7 +981,7 @@ realloc(void *addr, size_t size, struct malloc_type *mtp, int flags)
uma_zone_t zone;
uma_slab_t slab;
#endif
- unsigned long alloc;
+ size_t alloc;
void *newaddr;
KASSERT(mtp->ks_version == M_VERSION,
@@ -1045,7 +1045,7 @@ realloc(void *addr, size_t size, struct malloc_type *mtp, int flags)
* valid before performing the copy.
*/
kasan_mark(addr, alloc, alloc, 0);
- bcopy(addr, newaddr, min(size, alloc));
+ bcopy(addr, newaddr, MIN(size, alloc));
free(addr, mtp);
return (newaddr);
}