From: Szabolcs Nagy <szabolcs.nagy@arm.com>
To: <libc-alpha@sourceware.org>
Subject: [PATCH 09/20] malloc: Use uintptr_t in alloc_buffer
Date: Thu, 27 Oct 2022 16:32:54 +0100 [thread overview]
Message-ID: <6ff097d212f61a22d620d5aae268007a4e6cf8c1.1666877952.git.szabolcs.nagy@arm.com> (raw)
In-Reply-To: <cover.1666877952.git.szabolcs.nagy@arm.com>
The values represnt pointers and not sizes. The members of struct
alloc_buffer are already uintptr_t.
---
include/alloc_buffer.h | 10 +++++-----
malloc/alloc_buffer_alloc_array.c | 6 +++---
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/include/alloc_buffer.h b/include/alloc_buffer.h
index be33e8b68c..1c1dbe0a46 100644
--- a/include/alloc_buffer.h
+++ b/include/alloc_buffer.h
@@ -248,9 +248,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 +282,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. */
--
2.25.1
next prev parent reply other threads:[~2022-10-27 15:33 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-27 15:32 [PATCH 00/20] patches from the morello port Szabolcs Nagy
2022-10-27 15:32 ` [PATCH 01/20] Fix OOB read in stdlib thousand grouping parsing [BZ #29727] Szabolcs Nagy
2022-10-27 15:38 ` Andreas Schwab
2022-10-27 15:32 ` [PATCH 02/20] scripts: Use bool in tunables initializer Szabolcs Nagy
2022-10-27 16:29 ` Florian Weimer
2022-10-27 15:32 ` [PATCH 03/20] aarch64: Don't build wordcopy Szabolcs Nagy
2022-10-27 16:59 ` Adhemerval Zanella Netto
2022-10-27 15:32 ` [PATCH 04/20] aarch64: Fix the extension header write in getcontext and swapcontext Szabolcs Nagy
2022-10-28 14:03 ` Adhemerval Zanella Netto
2022-10-27 15:32 ` [PATCH 05/20] Fix invalid pointer dereference in wcscpy_chk Szabolcs Nagy
2022-10-28 5:34 ` Florian Weimer
2022-10-27 15:32 ` [PATCH 06/20] Fix invalid pointer dereference in wcpcpy_chk Szabolcs Nagy
2022-10-28 5:45 ` Florian Weimer
2022-10-27 15:32 ` [PATCH 07/20] Use uintptr_t in fts for pointer alignment Szabolcs Nagy
2022-10-31 16:08 ` Adhemerval Zanella Netto
2022-10-27 15:32 ` [PATCH 08/20] malloc: Use uintptr_t " Szabolcs Nagy
2022-10-31 16:09 ` Adhemerval Zanella Netto
2022-10-27 15:32 ` Szabolcs Nagy [this message]
2022-10-27 16:15 ` [PATCH 09/20] malloc: Use uintptr_t in alloc_buffer Florian Weimer
2022-10-27 15:33 ` [PATCH 10/20] malloc: Fix alignment logic in obstack Szabolcs Nagy
2022-10-31 16:14 ` Adhemerval Zanella Netto
2022-11-01 9:43 ` Szabolcs Nagy
2022-11-01 13:07 ` Adhemerval Zanella Netto
2022-10-27 15:33 ` [PATCH 11/20] elf: Fix alloca size in _dl_debug_vdprintf Szabolcs Nagy
2022-10-28 5:31 ` Florian Weimer
2022-10-28 13:56 ` Adhemerval Zanella Netto
2022-10-28 14:43 ` Szabolcs Nagy
2022-10-28 14:48 ` Adhemerval Zanella Netto
2022-10-27 15:33 ` [PATCH 12/20] Fix the symbolic link of multilib dirs Szabolcs Nagy
2022-10-27 15:33 ` [PATCH 13/20] Use uintptr_t in string/tester for pointer alignment Szabolcs Nagy
2022-10-28 14:11 ` Adhemerval Zanella Netto
2022-10-27 15:33 ` [PATCH 14/20] Fix off-by-one OOB write in iconv/tst-iconv-mt Szabolcs Nagy
2022-10-28 5:39 ` Florian Weimer
2022-10-27 15:33 ` [PATCH 15/20] Fix off-by-one OOB read in elf/tst-tls20 Szabolcs Nagy
2022-10-28 5:36 ` Florian Weimer
2022-10-27 15:33 ` [PATCH 16/20] Fix malloc/tst-scratch_buffer OOB access Szabolcs Nagy
2022-10-28 5:41 ` Florian Weimer
2022-10-28 11:24 ` Szabolcs Nagy
2022-10-28 11:30 ` Florian Weimer
2022-10-28 12:23 ` Szabolcs Nagy
2022-10-28 12:27 ` Florian Weimer
2022-10-27 15:33 ` [PATCH 17/20] Fix missing NUL terminator in stdio-common/scanf13 test Szabolcs Nagy
2022-10-28 5:44 ` Florian Weimer
2022-10-27 15:33 ` [PATCH 18/20] Fix elf/tst-dlmopen-twice to support enough link namespaces Szabolcs Nagy
2022-10-27 16:24 ` Florian Weimer
2022-10-27 16:45 ` Szabolcs Nagy
2022-10-27 16:51 ` Florian Weimer
2022-10-27 16:47 ` Adhemerval Zanella Netto
2022-10-27 15:33 ` [PATCH 19/20] Fix resource/bug-ulimit1 test Szabolcs Nagy
2022-10-27 16:48 ` Adhemerval Zanella Netto
2022-10-27 15:34 ` [PATCH 20/20] Fix stdlib/test-dlclose-exit-race to not hang Szabolcs Nagy
2022-10-27 16:22 ` Florian Weimer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6ff097d212f61a22d620d5aae268007a4e6cf8c1.1666877952.git.szabolcs.nagy@arm.com \
--to=szabolcs.nagy@arm.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).