AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-13 12:40:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

cheri: malloc: use uintptr_t in alloc_buffer

Browse Source 
This is the right type as the values hold pointers.
This commit is contained in:
Szabolcs Nagy 2022-03-16 12:09:15 +00:00
parent 4064e7a4fc
commit 84068c087b
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/alloc_buffer.h
View File

@ -82,6 +82,7 @@
#include <stddef.h>
#include <stdlib.h>
#include <sys/param.h>
#include <libc-pointer-arith.h>
/* struct alloc_buffer objects refer to a region of bytes in memory of a
fixed size. The functions below can be used to allocate single
@ -248,9 +249,9 @@ __alloc_buffer_alloc (struct alloc_buffer *buf, size_t size, size_t align)
if (size == 1 && align == 1)
return alloc_buffer_alloc_bytes (buf, size);
size_t current = buf->__alloc_buffer_current;
size_t aligned = roundup (current, align);
size_t new_current = aligned + size;
uintptr_t current = buf->__alloc_buffer_current;
uintptr_t aligned = roundup (current, align);
uintptr_t new_current = aligned + size;
if (aligned >= current /* No overflow in align step. */
&& new_current >= size /* No overflow in size computation. */
&& new_current <= buf->__alloc_buffer_end) /* Room in buffer. */
@ -282,8 +283,8 @@ __alloc_buffer_next (struct alloc_buffer *buf, size_t align)
if (align == 1)
return (const void *) buf->__alloc_buffer_current;
size_t current = buf->__alloc_buffer_current;
size_t aligned = roundup (current, align);
uintptr_t current = buf->__alloc_buffer_current;
uintptr_t aligned = roundup (current, align);
if (aligned >= current /* No overflow in align step. */
&& aligned <= buf->__alloc_buffer_end) /* Room in buffer. */
{

6
malloc/alloc_buffer_alloc_array.c
View File

@ -23,12 +23,12 @@ void *
__libc_alloc_buffer_alloc_array (struct alloc_buffer *buf, size_t element_size,
size_t align, size_t count)
{
size_t current = buf->__alloc_buffer_current;
uintptr_t current = buf->__alloc_buffer_current;
/* The caller asserts that align is a power of two. */
size_t aligned = ALIGN_UP (current, align);
uintptr_t aligned = ALIGN_UP (current, align);
size_t size;
bool overflow = __builtin_mul_overflow (element_size, count, &size);
size_t new_current = aligned + size;
uintptr_t new_current = aligned + size;
if (!overflow /* Multiplication did not overflow. */
&& aligned >= current /* No overflow in align step. */
&& new_current >= size /* No overflow in size computation. */