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] TODO(uapi): cheri: fix clone_args Date: Thu, 27 Oct 2022 13:53:37 +0000 (GMT) [thread overview] Message-ID: <20221027135337.C2F303851522@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=c59bf19563fae0c9c3c741e104ab2162e39a175e commit c59bf19563fae0c9c3c741e104ab2162e39a175e Author: Szabolcs Nagy <szabolcs.nagy@arm.com> 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. */
next reply other threads:[~2022-10-27 13:53 UTC|newest] Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-10-27 13:53 Szabolcs Nagy [this message] -- strict thread matches above, loose matches on Subject: below -- 2022-11-23 14:43 Szabolcs Nagy 2022-10-26 15:15 Szabolcs Nagy 2022-08-05 19:32 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=20221027135337.C2F303851522@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: linkBe 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).