diff options
| author | Szabolcs Nagy <szabolcs.nagy@arm.com> | 2022-03-16 12:09:15 +0000 |
|---|---|---|
| committer | Szabolcs Nagy <szabolcs.nagy@arm.com> | 2022-08-05 19:45:19 +0100 |
| commit | 84068c087ba210a694aa656f6c873f4d7daa84d0 (patch) | |
| tree | dcc05810e9d13ab9247bc3cf6e85a7b37143602e | |
| parent | 4064e7a4fc027aef0f023dc93fe436a512b1aaf9 (diff) | |
| download | glibc-84068c087ba210a694aa656f6c873f4d7daa84d0.tar.gz glibc-84068c087ba210a694aa656f6c873f4d7daa84d0.tar.xz glibc-84068c087ba210a694aa656f6c873f4d7daa84d0.zip | |
cheri: malloc: use uintptr_t in alloc_buffer
This is the right type as the values hold pointers.
| -rw-r--r-- | include/alloc_buffer.h | 11 | ||||
| -rw-r--r-- | malloc/alloc_buffer_alloc_array.c | 6 |
2 files changed, 9 insertions, 8 deletions
diff --git a/include/alloc_buffer.h b/include/alloc_buffer.h index be33e8b68c..b0d50289f0 100644 --- a/include/alloc_buffer.h +++ b/include/alloc_buffer.h @@ -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. */ { diff --git a/malloc/alloc_buffer_alloc_array.c b/malloc/alloc_buffer_alloc_array.c index d8c08d03ea..b5f32bb630 100644 --- a/malloc/alloc_buffer_alloc_array.c +++ b/malloc/alloc_buffer_alloc_array.c @@ -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. */ |