public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc/arm/morello/main] cheri: fix __minimal_malloc
@ 2022-08-05 19:33 Szabolcs Nagy
0 siblings, 0 replies; 4+ messages in thread
From: Szabolcs Nagy @ 2022-08-05 19:33 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=110733491ab6faea0583accddec5877678c60052
commit 110733491ab6faea0583accddec5877678c60052
Author: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date: Tue Mar 1 12:42:26 2022 +0000
cheri: fix __minimal_malloc
The linker created _end symbol does not have the right bounds, so
don't try to reuse leftover memory at the end of the .data section.
Diff:
---
elf/dl-minimal-malloc.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/elf/dl-minimal-malloc.c b/elf/dl-minimal-malloc.c
index 7cca54208d..5f5f5554e5 100644
--- a/elf/dl-minimal-malloc.c
+++ b/elf/dl-minimal-malloc.c
@@ -23,6 +23,7 @@
# pragma GCC visibility push(hidden)
#endif
#include <assert.h>
+#include <stdint.h>
#include <string.h>
#include <ldsodefs.h>
#include <malloc/malloc-internal.h>
@@ -33,6 +34,7 @@ static void *alloc_ptr, *alloc_end, *alloc_last_block;
void *
__minimal_malloc (size_t n)
{
+#ifndef __CHERI_PURE_CAPABILITY__
if (alloc_end == 0)
{
/* Consume any unused space in the last page of our data segment. */
@@ -42,9 +44,10 @@ __minimal_malloc (size_t n)
+ GLRO(dl_pagesize) - 1)
& ~(GLRO(dl_pagesize) - 1));
}
+#endif
/* Make sure the allocation pointer is ideally aligned. */
- alloc_ptr = (void *) 0 + (((alloc_ptr - (void *) 0) + MALLOC_ALIGNMENT - 1)
+ alloc_ptr = (void *)(((uintptr_t)alloc_ptr + (MALLOC_ALIGNMENT - 1))
& ~(MALLOC_ALIGNMENT - 1));
if (alloc_ptr + n >= alloc_end || n >= -(uintptr_t) alloc_ptr)
^ permalink raw reply [flat|nested] 4+ messages in thread
* [glibc/arm/morello/main] cheri: fix __minimal_malloc
@ 2022-11-23 14:44 Szabolcs Nagy
0 siblings, 0 replies; 4+ messages in thread
From: Szabolcs Nagy @ 2022-11-23 14:44 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=b4e28743ec4dbec80c2ebc1f596409ddca60322c
commit b4e28743ec4dbec80c2ebc1f596409ddca60322c
Author: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date: Tue Mar 1 12:42:26 2022 +0000
cheri: fix __minimal_malloc
The linker created _end symbol does not have the right bounds, so
don't try to reuse leftover memory at the end of the .data section.
Diff:
---
elf/dl-minimal-malloc.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/elf/dl-minimal-malloc.c b/elf/dl-minimal-malloc.c
index 7cca54208d..5f5f5554e5 100644
--- a/elf/dl-minimal-malloc.c
+++ b/elf/dl-minimal-malloc.c
@@ -23,6 +23,7 @@
# pragma GCC visibility push(hidden)
#endif
#include <assert.h>
+#include <stdint.h>
#include <string.h>
#include <ldsodefs.h>
#include <malloc/malloc-internal.h>
@@ -33,6 +34,7 @@ static void *alloc_ptr, *alloc_end, *alloc_last_block;
void *
__minimal_malloc (size_t n)
{
+#ifndef __CHERI_PURE_CAPABILITY__
if (alloc_end == 0)
{
/* Consume any unused space in the last page of our data segment. */
@@ -42,9 +44,10 @@ __minimal_malloc (size_t n)
+ GLRO(dl_pagesize) - 1)
& ~(GLRO(dl_pagesize) - 1));
}
+#endif
/* Make sure the allocation pointer is ideally aligned. */
- alloc_ptr = (void *) 0 + (((alloc_ptr - (void *) 0) + MALLOC_ALIGNMENT - 1)
+ alloc_ptr = (void *)(((uintptr_t)alloc_ptr + (MALLOC_ALIGNMENT - 1))
& ~(MALLOC_ALIGNMENT - 1));
if (alloc_ptr + n >= alloc_end || n >= -(uintptr_t) alloc_ptr)
^ permalink raw reply [flat|nested] 4+ messages in thread
* [glibc/arm/morello/main] cheri: fix __minimal_malloc
@ 2022-10-27 13:54 Szabolcs Nagy
0 siblings, 0 replies; 4+ messages in thread
From: Szabolcs Nagy @ 2022-10-27 13:54 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=db0005c7d3ad9f27e1acc0610b58dddde095be00
commit db0005c7d3ad9f27e1acc0610b58dddde095be00
Author: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date: Tue Mar 1 12:42:26 2022 +0000
cheri: fix __minimal_malloc
The linker created _end symbol does not have the right bounds, so
don't try to reuse leftover memory at the end of the .data section.
Diff:
---
elf/dl-minimal-malloc.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/elf/dl-minimal-malloc.c b/elf/dl-minimal-malloc.c
index 7cca54208d..5f5f5554e5 100644
--- a/elf/dl-minimal-malloc.c
+++ b/elf/dl-minimal-malloc.c
@@ -23,6 +23,7 @@
# pragma GCC visibility push(hidden)
#endif
#include <assert.h>
+#include <stdint.h>
#include <string.h>
#include <ldsodefs.h>
#include <malloc/malloc-internal.h>
@@ -33,6 +34,7 @@ static void *alloc_ptr, *alloc_end, *alloc_last_block;
void *
__minimal_malloc (size_t n)
{
+#ifndef __CHERI_PURE_CAPABILITY__
if (alloc_end == 0)
{
/* Consume any unused space in the last page of our data segment. */
@@ -42,9 +44,10 @@ __minimal_malloc (size_t n)
+ GLRO(dl_pagesize) - 1)
& ~(GLRO(dl_pagesize) - 1));
}
+#endif
/* Make sure the allocation pointer is ideally aligned. */
- alloc_ptr = (void *) 0 + (((alloc_ptr - (void *) 0) + MALLOC_ALIGNMENT - 1)
+ alloc_ptr = (void *)(((uintptr_t)alloc_ptr + (MALLOC_ALIGNMENT - 1))
& ~(MALLOC_ALIGNMENT - 1));
if (alloc_ptr + n >= alloc_end || n >= -(uintptr_t) alloc_ptr)
^ permalink raw reply [flat|nested] 4+ messages in thread
* [glibc/arm/morello/main] cheri: fix __minimal_malloc
@ 2022-10-26 15:16 Szabolcs Nagy
0 siblings, 0 replies; 4+ messages in thread
From: Szabolcs Nagy @ 2022-10-26 15:16 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=0b476d1e176c6632807cfdb1be7fb0041cdbf82b
commit 0b476d1e176c6632807cfdb1be7fb0041cdbf82b
Author: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date: Tue Mar 1 12:42:26 2022 +0000
cheri: fix __minimal_malloc
The linker created _end symbol does not have the right bounds, so
don't try to reuse leftover memory at the end of the .data section.
Diff:
---
elf/dl-minimal-malloc.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/elf/dl-minimal-malloc.c b/elf/dl-minimal-malloc.c
index 7cca54208d..5f5f5554e5 100644
--- a/elf/dl-minimal-malloc.c
+++ b/elf/dl-minimal-malloc.c
@@ -23,6 +23,7 @@
# pragma GCC visibility push(hidden)
#endif
#include <assert.h>
+#include <stdint.h>
#include <string.h>
#include <ldsodefs.h>
#include <malloc/malloc-internal.h>
@@ -33,6 +34,7 @@ static void *alloc_ptr, *alloc_end, *alloc_last_block;
void *
__minimal_malloc (size_t n)
{
+#ifndef __CHERI_PURE_CAPABILITY__
if (alloc_end == 0)
{
/* Consume any unused space in the last page of our data segment. */
@@ -42,9 +44,10 @@ __minimal_malloc (size_t n)
+ GLRO(dl_pagesize) - 1)
& ~(GLRO(dl_pagesize) - 1));
}
+#endif
/* Make sure the allocation pointer is ideally aligned. */
- alloc_ptr = (void *) 0 + (((alloc_ptr - (void *) 0) + MALLOC_ALIGNMENT - 1)
+ alloc_ptr = (void *)(((uintptr_t)alloc_ptr + (MALLOC_ALIGNMENT - 1))
& ~(MALLOC_ALIGNMENT - 1));
if (alloc_ptr + n >= alloc_end || n >= -(uintptr_t) alloc_ptr)
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-11-23 14:44 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-05 19:33 [glibc/arm/morello/main] cheri: fix __minimal_malloc Szabolcs Nagy
2022-10-26 15:16 Szabolcs Nagy
2022-10-27 13:54 Szabolcs Nagy
2022-11-23 14:44 Szabolcs Nagy
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).