[PATCH] malloc_stats(): Fix `unsigned int` overflow
Niklas Hambüchen
mail@nh2.me
Fri Oct 29 17:11:34 GMT 2021
Fixes malloc_stats() returning vastly wrong information for programs
that use more than 2 GiB memory.
`man mallinfo` documents that it uses `int` and wraps around, but
`man malloc_stats` does not, and should not.
Fixes https://sourceware.org/bugzilla/show_bug.cgi?id=21556
Signed-off-by: Niklas Hambüchen <mail@nh2.me>
---
malloc/malloc.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/malloc/malloc.c b/malloc/malloc.c
index 095d97a3be..cdc9aff9d5 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -5151,7 +5151,7 @@ __malloc_stats (void)
{
int i;
mstate ar_ptr;
- unsigned int in_use_b = mp_.mmapped_mem, system_b = in_use_b;
+ size_t in_use_b = mp_.mmapped_mem, system_b = in_use_b;
if (!__malloc_initialized)
ptmalloc_init ();
@@ -5166,8 +5166,8 @@ __malloc_stats (void)
__libc_lock_lock (ar_ptr->mutex);
int_mallinfo (ar_ptr, &mi);
fprintf (stderr, "Arena %d:\n", i);
- fprintf (stderr, "system bytes = %10u\n", (unsigned int) mi.arena);
- fprintf (stderr, "in use bytes = %10u\n", (unsigned int) mi.uordblks);
+ fprintf (stderr, "system bytes = %10lu\n", mi.arena);
+ fprintf (stderr, "in use bytes = %10lu\n", mi.uordblks);
#if MALLOC_DEBUG > 1
if (i > 0)
dump_heap (heap_for_ptr (top (ar_ptr)));
@@ -5180,9 +5180,9 @@ __malloc_stats (void)
break;
}
fprintf (stderr, "Total (incl. mmap):\n");
- fprintf (stderr, "system bytes = %10u\n", system_b);
- fprintf (stderr, "in use bytes = %10u\n", in_use_b);
- fprintf (stderr, "max mmap regions = %10u\n", (unsigned int) mp_.max_n_mmaps);
+ fprintf (stderr, "system bytes = %10lu\n", system_b);
+ fprintf (stderr, "in use bytes = %10lu\n", in_use_b);
+ fprintf (stderr, "max mmap regions = %10d\n", mp_.max_n_mmaps);
fprintf (stderr, "max mmap bytes = %10lu\n",
(unsigned long) mp_.max_mmapped_mem);
stderr->_flags2 = old_flags2;
--
2.31.1
More information about the Libc-alpha
mailing list