From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id 2A10E3857355; Fri, 5 Aug 2022 19:32:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2A10E3857355 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] TODO(uapi): cheri: fix clone_args X-Act-Checkin: glibc X-Git-Author: Szabolcs Nagy X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: ed90470cc02574d8a0f1aae6c38089b43cc6e5f6 X-Git-Newrev: fb41a562bf4acfed5c7dc6c0c9b6c2f365d6731a Message-Id: <20220805193258.2A10E3857355@sourceware.org> Date: Fri, 5 Aug 2022 19:32:58 +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:32:58 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=fb41a562bf4acfed5c7dc6c0c9b6c2f365d6731a commit fb41a562bf4acfed5c7dc6c0c9b6c2f365d6731a Author: Szabolcs Nagy Date: Mon Aug 2 11:34:56 2021 +0100 TODO(uapi): cheri: fix clone_args Current clone_args does not support 128 bit pointers. TODO: the fix is incomplete (missing clone3 abi checks) and has to be aligned with purecap clone3 struct layout. Diff: --- sysdeps/unix/sysv/linux/clone-internal.c | 2 ++ sysdeps/unix/sysv/linux/clone3.h | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/sysdeps/unix/sysv/linux/clone-internal.c b/sysdeps/unix/sysv/linux/clone-internal.c index a71effcbd3..8550fe9b24 100644 --- a/sysdeps/unix/sysv/linux/clone-internal.c +++ b/sysdeps/unix/sysv/linux/clone-internal.c @@ -32,6 +32,7 @@ #define offsetofend(TYPE, MEMBER) \ (offsetof (TYPE, MEMBER) + sizeof_field (TYPE, MEMBER)) +#ifndef __CHERI_PURE_CAPABILITY__ _Static_assert (__alignof (struct clone_args) == 8, "__alignof (struct clone_args) != 8"); _Static_assert (offsetofend (struct clone_args, tls) == CLONE_ARGS_SIZE_VER0, @@ -42,6 +43,7 @@ _Static_assert (offsetofend (struct clone_args, cgroup) == CLONE_ARGS_SIZE_VER2, "offsetofend (struct clone_args, cgroup) != CLONE_ARGS_SIZE_VER2"); _Static_assert (sizeof (struct clone_args) == CLONE_ARGS_SIZE_VER2, "sizeof (struct clone_args) != CLONE_ARGS_SIZE_VER2"); +#endif int __clone_internal (struct clone_args *cl_args, diff --git a/sysdeps/unix/sysv/linux/clone3.h b/sysdeps/unix/sysv/linux/clone3.h index 889014a6a9..a3fc8deb29 100644 --- a/sysdeps/unix/sysv/linux/clone3.h +++ b/sysdeps/unix/sysv/linux/clone3.h @@ -34,6 +34,30 @@ typedef __U64_TYPE __aligned_uint64_t __attribute__ ((__aligned__ (8))); struct clone_args { +#ifdef __CHERI_PURE_CAPABILITY__ + /* Flags bit mask. */ + __uint64_t flags; + /* Where to store PID file descriptor (pid_t *). */ + __uintcap_t pidfd; + /* Where to store child TID, in child's memory (pid_t *). */ + __uintcap_t child_tid; + /* Where to store child TID, in parent's memory (int *). */ + __uintcap_t parent_tid; + /* Signal to deliver to parent on child termination */ + __uint64_t exit_signal; + /* The lowest address of stack. */ + __uintcap_t stack; + /* Size of stack. */ + __uint64_t stack_size; + /* Location of new TLS. */ + __uintcap_t tls; + /* Pointer to a pid_t array (since Linux 5.5). */ + __uintcap_t set_tid; + /* Number of elements in set_tid (since Linux 5.5). */ + __uint64_t set_tid_size; + /* File descriptor for target cgroup of child (since Linux 5.7). */ + __uint64_t cgroup; +#else /* Flags bit mask. */ __aligned_uint64_t flags; /* Where to store PID file descriptor (pid_t *). */ @@ -56,6 +80,7 @@ struct clone_args __aligned_uint64_t set_tid_size; /* File descriptor for target cgroup of child (since Linux 5.7). */ __aligned_uint64_t cgroup; +#endif }; /* The wrapper of clone3. */