From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id 0EEFE3858294; Fri, 5 Aug 2022 19:35:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0EEFE3858294 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Szabolcs Nagy To: glibc-cvs@sourceware.org Subject: [glibc/arm/morello/main] cheri: fix qsort for capabilities X-Act-Checkin: glibc X-Git-Author: Szabolcs Nagy X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: f7842f9392d081ff6decfbd2fc9ca9973c83c4bb X-Git-Newrev: 159a76a8dd93700cc5a8039e7483836d86974ce2 Message-Id: <20220805193515.0EEFE3858294@sourceware.org> Date: Fri, 5 Aug 2022 19:35:15 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Aug 2022 19:35:15 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=159a76a8dd93700cc5a8039e7483836d86974ce2 commit 159a76a8dd93700cc5a8039e7483836d86974ce2 Author: Szabolcs Nagy 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;