public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc/arm/morello/main] cheri: fix qsort for capabilities
@ 2022-10-27 13:56 Szabolcs Nagy
  0 siblings, 0 replies; 4+ messages in thread
From: Szabolcs Nagy @ 2022-10-27 13:56 UTC (permalink / raw)
  To: glibc-cvs

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=db3c584cbf398c47fe3c9e9428bc6512cb4a2f23

commit db3c584cbf398c47fe3c9e9428bc6512cb4a2f23
Author: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date:   Mon Jul 12 13:06:40 2021 +0100

    cheri: fix qsort for capabilities
    
    On capability targets avoid copying pointers via unsigned long.

Diff:
---
 stdlib/msort.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/stdlib/msort.c b/stdlib/msort.c
index cbe9a4a8fd..43222e6c9a 100644
--- a/stdlib/msort.c
+++ b/stdlib/msort.c
@@ -289,6 +289,10 @@ __qsort_r (void *b, size_t n, size_t s, __compar_d_fn_t cmp, void *arg)
 		   && ((char *) b - (char *) 0) % __alignof__ (uint64_t) == 0)
 	    p.var = 1;
 	  else if ((s & (sizeof (unsigned long) - 1)) == 0
+#ifdef __CHERI_PURE_CAPABILITY__
+		   && ((char *) b - (char *) 0)
+		      % __alignof__ (void *) != 0
+#endif
 		   && ((char *) b - (char *) 0)
 		      % __alignof__ (unsigned long) == 0)
 	    p.var = 2;

^ permalink raw reply	[flat|nested] 4+ messages in thread
* [glibc/arm/morello/main] cheri: fix qsort for capabilities
@ 2022-11-23 14:46 Szabolcs Nagy
  0 siblings, 0 replies; 4+ messages in thread
From: Szabolcs Nagy @ 2022-11-23 14:46 UTC (permalink / raw)
  To: glibc-cvs

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=cf95053a832df4dc3c6f72de76d366856cdf7eae

commit cf95053a832df4dc3c6f72de76d366856cdf7eae
Author: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date:   Mon Jul 12 13:06:40 2021 +0100

    cheri: fix qsort for capabilities
    
    On capability targets avoid copying pointers via unsigned long.

Diff:
---
 stdlib/msort.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/stdlib/msort.c b/stdlib/msort.c
index cbe9a4a8fd..43222e6c9a 100644
--- a/stdlib/msort.c
+++ b/stdlib/msort.c
@@ -289,6 +289,10 @@ __qsort_r (void *b, size_t n, size_t s, __compar_d_fn_t cmp, void *arg)
 		   && ((char *) b - (char *) 0) % __alignof__ (uint64_t) == 0)
 	    p.var = 1;
 	  else if ((s & (sizeof (unsigned long) - 1)) == 0
+#ifdef __CHERI_PURE_CAPABILITY__
+		   && ((char *) b - (char *) 0)
+		      % __alignof__ (void *) != 0
+#endif
 		   && ((char *) b - (char *) 0)
 		      % __alignof__ (unsigned long) == 0)
 	    p.var = 2;

^ permalink raw reply	[flat|nested] 4+ messages in thread
* [glibc/arm/morello/main] cheri: fix qsort for capabilities
@ 2022-10-26 15:18 Szabolcs Nagy
  0 siblings, 0 replies; 4+ messages in thread
From: Szabolcs Nagy @ 2022-10-26 15:18 UTC (permalink / raw)
  To: glibc-cvs

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=5e3c7df415a06e99191afc0fe47514821d969567

commit 5e3c7df415a06e99191afc0fe47514821d969567
Author: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date:   Mon Jul 12 13:06:40 2021 +0100

    cheri: fix qsort for capabilities
    
    On capability targets avoid copying pointers via unsigned long.

Diff:
---
 stdlib/msort.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/stdlib/msort.c b/stdlib/msort.c
index cbe9a4a8fd..43222e6c9a 100644
--- a/stdlib/msort.c
+++ b/stdlib/msort.c
@@ -289,6 +289,10 @@ __qsort_r (void *b, size_t n, size_t s, __compar_d_fn_t cmp, void *arg)
 		   && ((char *) b - (char *) 0) % __alignof__ (uint64_t) == 0)
 	    p.var = 1;
 	  else if ((s & (sizeof (unsigned long) - 1)) == 0
+#ifdef __CHERI_PURE_CAPABILITY__
+		   && ((char *) b - (char *) 0)
+		      % __alignof__ (void *) != 0
+#endif
 		   && ((char *) b - (char *) 0)
 		      % __alignof__ (unsigned long) == 0)
 	    p.var = 2;

^ permalink raw reply	[flat|nested] 4+ messages in thread
* [glibc/arm/morello/main] cheri: fix qsort for capabilities
@ 2022-08-05 19:35 Szabolcs Nagy
  0 siblings, 0 replies; 4+ messages in thread
From: Szabolcs Nagy @ 2022-08-05 19:35 UTC (permalink / raw)
  To: glibc-cvs

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=159a76a8dd93700cc5a8039e7483836d86974ce2

commit 159a76a8dd93700cc5a8039e7483836d86974ce2
Author: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date:   Mon Jul 12 13:06:40 2021 +0100

    cheri: fix qsort for capabilities
    
    On capability targets avoid copying pointers via unsigned long.

Diff:
---
 stdlib/msort.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/stdlib/msort.c b/stdlib/msort.c
index cbe9a4a8fd..43222e6c9a 100644
--- a/stdlib/msort.c
+++ b/stdlib/msort.c
@@ -289,6 +289,10 @@ __qsort_r (void *b, size_t n, size_t s, __compar_d_fn_t cmp, void *arg)
 		   && ((char *) b - (char *) 0) % __alignof__ (uint64_t) == 0)
 	    p.var = 1;
 	  else if ((s & (sizeof (unsigned long) - 1)) == 0
+#ifdef __CHERI_PURE_CAPABILITY__
+		   && ((char *) b - (char *) 0)
+		      % __alignof__ (void *) != 0
+#endif
 		   && ((char *) b - (char *) 0)
 		      % __alignof__ (unsigned long) == 0)
 	    p.var = 2;


^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-11-23 14:46 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-27 13:56 [glibc/arm/morello/main] cheri: fix qsort for capabilities Szabolcs Nagy
  -- strict thread matches above, loose matches on Subject: below --
2022-11-23 14:46 Szabolcs Nagy
2022-10-26 15:18 Szabolcs Nagy
2022-08-05 19:35 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).