public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Szabolcs Nagy <nsz@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc/arm/morello/main] cheri: malloc: align up without breaking capability in memalign Date: Fri, 5 Aug 2022 19:35:40 +0000 (GMT) [thread overview] Message-ID: <20220805193540.61C553857363@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=4064e7a4fc027aef0f023dc93fe436a512b1aaf9 commit 4064e7a4fc027aef0f023dc93fe436a512b1aaf9 Author: Szabolcs Nagy <szabolcs.nagy@arm.com> Date: Tue Mar 15 09:54:59 2022 +0000 cheri: malloc: align up without breaking capability in memalign Diff: --- malloc/malloc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/malloc/malloc.c b/malloc/malloc.c index 062ca0dc0a..02df29d2ad 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -4982,8 +4982,7 @@ _int_memalign (mstate av, size_t alignment, size_t bytes) we can move to the next aligned spot -- we've allocated enough total room so that this is always possible. */ - brk = (char *) mem2chunk (((unsigned long) (m + alignment - 1)) & - - ((signed long) alignment)); + brk = (char *) mem2chunk (m + alignment - ((unsigned long) (m) % alignment)); if ((unsigned long) (brk - (char *) (p)) < MINSIZE) brk += alignment;
next reply other threads:[~2022-08-05 19:35 UTC|newest] Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-08-05 19:35 Szabolcs Nagy [this message] 2022-10-26 15:18 Szabolcs Nagy 2022-10-27 13:56 Szabolcs Nagy 2022-11-23 14:46 Szabolcs Nagy
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=20220805193540.61C553857363@sourceware.org \ --to=nsz@sourceware.org \ --cc=glibc-cvs@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: linkBe 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).