diff options
author | Szabolcs Nagy <szabolcs.nagy@arm.com> | 2021-08-02 11:34:56 +0100 |
---|---|---|
committer | Szabolcs Nagy <szabolcs.nagy@arm.com> | 2022-11-22 14:31:25 +0000 |
commit | b811a41c571a6a3c640d4d42177652a3034aee7b (patch) | |
tree | 502b08c39a8833c68e07d26765fde7244d8be119 /sysdeps/unix | |
parent | 2b0a2bff6091ad255a94d9905cdaccdaaddbd927 (diff) | |
download | glibc-b811a41c571a6a3c640d4d42177652a3034aee7b.zip glibc-b811a41c571a6a3c640d4d42177652a3034aee7b.tar.gz glibc-b811a41c571a6a3c640d4d42177652a3034aee7b.tar.bz2 |
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.
Diffstat (limited to 'sysdeps/unix')
-rw-r--r-- | sysdeps/unix/sysv/linux/clone-internal.c | 2 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/clone3.h | 25 |
2 files changed, 27 insertions, 0 deletions
diff --git a/sysdeps/unix/sysv/linux/clone-internal.c b/sysdeps/unix/sysv/linux/clone-internal.c index a71effc..8550fe9 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 889014a..a3fc8de 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. */ |