From: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date: Mon, 28 Mar 2022 12:57:10 +0000 (+0100)
Subject: cheri: malloc: avoid switch over uintptr_t
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=257781e305b49b3fd4a9b23f8279ded07a395e29;p=thirdparty%2Fglibc.git

cheri: malloc: avoid switch over uintptr_t

We should use a type that guarantees to represent all address bits.
In CHERI C this would be ptraddr_t, but we use unsigned long for now
not to cause regressions on other targets where this type is missing.
---

diff --git a/malloc/mcheck-impl.c b/malloc/mcheck-impl.c
index 00b766219b0..e908bfd0624 100644
--- a/malloc/mcheck-impl.c
+++ b/malloc/mcheck-impl.c
@@ -74,7 +74,7 @@ checkhdr (const struct hdr *hdr)
        an error and report it.  */
     return MCHECK_OK;
 
-  switch (hdr->magic ^ ((uintptr_t) hdr->prev + (uintptr_t) hdr->next))
+  switch (hdr->magic ^ ((unsigned long) hdr->prev + (unsigned long) hdr->next))
     {
     default:
       status = MCHECK_HEAD;