diff options
| author | Szabolcs Nagy <szabolcs.nagy@arm.com> | 2021-07-12 11:11:05 +0100 |
|---|---|---|
| committer | Szabolcs Nagy <szabolcs.nagy@arm.com> | 2022-08-05 19:45:19 +0100 |
| commit | 68822420a6da19adf0030ddc836c6968b071b467 (patch) | |
| tree | 1071e60507dcfe41d1a3c93624b8256e50f4872a | |
| parent | 159a76a8dd93700cc5a8039e7483836d86974ce2 (diff) | |
| download | glibc-68822420a6da19adf0030ddc836c6968b071b467.tar.gz glibc-68822420a6da19adf0030ddc836c6968b071b467.tar.xz glibc-68822420a6da19adf0030ddc836c6968b071b467.zip | |
cheri: fix pointer tagging in tsearch
USE_MALLOC_LOW_BIT should work for capabilities too, but we need to ensure that pointer provenance is right: the red/black flag is computed as uintptr_t, but with uintptr_t | uintptr_t it's not clear which side provides the provenance. So use unsigned int type for the flag (which is the type used in case of !USE_MALLOC_LOW_BIT anyway), then unsigned int | uintptr_t works. The type of RED is corrected too to match unsigned int.
| -rw-r--r-- | misc/tsearch.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/misc/tsearch.c b/misc/tsearch.c index 852cadf7b9..1787cf4991 100644 --- a/misc/tsearch.c +++ b/misc/tsearch.c @@ -131,15 +131,15 @@ typedef struct node_t uintptr_t right_node; } *node; -#define RED(N) (node)((N)->left_node & ((uintptr_t) 0x1)) +#define RED(N) (unsigned int)((N)->left_node & ((uintptr_t) 0x1)) #define SETRED(N) (N)->left_node |= ((uintptr_t) 0x1) #define SETBLACK(N) (N)->left_node &= ~((uintptr_t) 0x1) -#define SETNODEPTR(NP,P) (*NP) = (node)((((uintptr_t)(*NP)) \ +#define SETNODEPTR(NP,P) (*NP) = (node)((unsigned int)(((uintptr_t)(*NP)) \ & (uintptr_t) 0x1) | (uintptr_t)(P)) #define LEFT(N) (node)((N)->left_node & ~((uintptr_t) 0x1)) #define LEFTPTR(N) (node *)(&(N)->left_node) -#define SETLEFT(N,L) (N)->left_node = (((N)->left_node & (uintptr_t) 0x1) \ - | (uintptr_t)(L)) +#define SETLEFT(N,L) (N)->left_node = ((unsigned int)((N)->left_node \ + & (uintptr_t) 0x1) | (uintptr_t)(L)) #define RIGHT(N) (node)((N)->right_node) #define RIGHTPTR(N) (node *)(&(N)->right_node) #define SETRIGHT(N,R) (N)->right_node = (uintptr_t)(R) |