From a397b5508320e757274bc652b43ccb2e1a702933 Mon Sep 17 00:00:00 2001 From: Edward Tomasz Napierala Date: Wed, 16 Jun 2021 09:34:06 +0000 Subject: [PATCH] linux: implement set_cloned_tls() on arm64 This fixes random segfaults on "git commit --amend". Sponsored By: EPSRC Differential Revision: https://reviews.freebsd.org/D30508 --- sys/arm64/linux/linux_machdep.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/arm64/linux/linux_machdep.c b/sys/arm64/linux/linux_machdep.c index 80597a2922a..8e10fc9d26a 100644 --- a/sys/arm64/linux/linux_machdep.c +++ b/sys/arm64/linux/linux_machdep.c @@ -55,7 +55,6 @@ LIN_SDT_PROVIDER_DECLARE(LINUX_DTRACE); LIN_SDT_PROBE_DEFINE0(machdep, linux_mmap2, todo); LIN_SDT_PROBE_DEFINE0(machdep, linux_rt_sigsuspend, todo); LIN_SDT_PROBE_DEFINE0(machdep, linux_sigaltstack, todo); -LIN_SDT_PROBE_DEFINE0(machdep, linux_set_cloned_tls, todo); /* * LINUXTODO: deduplicate; linux_execve is common across archs, except that on @@ -141,11 +140,12 @@ linux_sigaltstack(struct thread *td, struct linux_sigaltstack_args *uap) return (EDOOFUS); } -/* LINUXTODO: implement arm64 linux_set_cloned_tls */ int linux_set_cloned_tls(struct thread *td, void *desc) { - LIN_SDT_PROBE0(machdep, linux_set_cloned_tls, todo); - return (EDOOFUS); + if ((uint64_t)desc >= VM_MAXUSER_ADDRESS) + return (EPERM); + + return (cpu_set_user_tls(td, desc)); } -- 2.45.2