From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id 46A1A3853D7C; Wed, 23 Nov 2022 14:43:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 46A1A3853D7C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1669214636; bh=/E+P0WhgjWH27XF9vLBp6v2bw/VrNb1lwOjKbWLz9G4=; h=From:To:Subject:Date:From; b=SY1bOuxdg+gYXEdwPUDxEh2e/JvuOr2OAaxG1jmAn2smV//bSLqvZGfTf1WJ7tpQG cgQ/jJK9+WdEo90LeErdyd4u8CIW8Z3W/uTbwcBqX++1qeVxTaJaSe2HsP7HifWLIC JL3N9hr9bxayJuGrZIPWddUmvyQNx8UNYdpHswig= 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 pselect signal mask argument X-Act-Checkin: glibc X-Git-Author: Szabolcs Nagy X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: 655faf81b2b6e2a82eb3e811ca79ad9a09d430fa X-Git-Newrev: d816620531d550a42d422fcb7cae534f260b30f3 Message-Id: <20221123144356.46A1A3853D7C@sourceware.org> Date: Wed, 23 Nov 2022 14:43:56 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=d816620531d550a42d422fcb7cae534f260b30f3 commit d816620531d550a42d422fcb7cae534f260b30f3 Author: Szabolcs Nagy Date: Thu Nov 17 15:19:10 2022 +0000 cheri: Fix pselect signal mask argument The signal mask argument is passed as a struct with a pointer and size in the linux syscall abi, but the types used in glibc were wrong for CHERI due to an x32 specific hack. Diff: --- sysdeps/unix/sysv/linux/pselect.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/sysdeps/unix/sysv/linux/pselect.c b/sysdeps/unix/sysv/linux/pselect.c index eba1c111f8..553de0a490 100644 --- a/sysdeps/unix/sysv/linux/pselect.c +++ b/sysdeps/unix/sysv/linux/pselect.c @@ -27,12 +27,19 @@ pselect64_syscall (int nfds, fd_set *readfds, fd_set *writefds, # define __NR_pselect6_time64 __NR_pselect6 #endif /* NB: This is required by ARGIFY used in x32 internal_syscallN. */ - __syscall_ulong_t data[2] = - { - (uintptr_t) sigmask, __NSIG_BYTES - }; +#ifdef __CHERI_PURE_CAPABILITY__ + typedef uintptr_t kernel_ptr_t; + typedef size_t kernel_size_t; +#else + typedef __syscall_ulong_t kernel_ptr_t; + typedef __syscall_ulong_t kernel_size_t; +#endif + struct { + kernel_ptr_t ptr; + kernel_size_t size; + } data = { (uintptr_t) sigmask, __NSIG_BYTES }; return SYSCALL_CANCEL (pselect6_time64, nfds, readfds, writefds, exceptfds, - timeout, data); + timeout, &data); } int