From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id 14B1A3851527; Thu, 27 Oct 2022 13:56:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 14B1A3851527 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666878999; bh=rnVQ44f5+j0dJbJIQDMw9yxOFjx9mXnlNd55U2cc5Xc=; h=From:To:Subject:Date:From; b=aOkGTOQK7ZLCsSd/WgfeAcdhYo9O7JlW9FHOZakuNRj0wfxGGXNdco/OnyO8uSE62 g3m0uQ22e2DjblxYlAg8TTgVtfmwQrwsgbNbGt4cEI6KEPcuau+4RNsj2myxOnJtjq k2sggDoIEnkVZOgHVH05kwWUrcjs1u1RBdZ+NM/Q= 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: 105c8d33c3ee1a4ce66219b546d0a0745b8f0f48 X-Git-Newrev: db3c584cbf398c47fe3c9e9428bc6512cb4a2f23 Message-Id: <20221027135639.14B1A3851527@sourceware.org> Date: Thu, 27 Oct 2022 13:56:39 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=db3c584cbf398c47fe3c9e9428bc6512cb4a2f23 commit db3c584cbf398c47fe3c9e9428bc6512cb4a2f23 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;