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: fix qsort for capabilities
Date: Wed, 23 Nov 2022 14:46:34 +0000 (GMT)	[thread overview]
Message-ID: <20221123144634.30CAC3852C4D@sourceware.org> (raw)

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;

             reply	other threads:[~2022-11-23 14:46 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-23 14:46 Szabolcs Nagy [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-10-27 13:56 Szabolcs Nagy
2022-10-26 15:18 Szabolcs Nagy
2022-08-05 19:35 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=20221123144634.30CAC3852C4D@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: link
Be 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).