Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 472f8a58 authored by Amanieu d'Antras's avatar Amanieu d'Antras Committed by Greg Kroah-Hartman
Browse files

arm64: Implement copy_thread_tls 



commit a4376f2fbcc8084832f2f114577c8d68234c7903 upstream.

This is required for clone3 which passes the TLS value through a
struct rather than a register.

Signed-off-by: default avatarAmanieu d'Antras <amanieu@gmail.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: <stable@vger.kernel.org> # 5.3.x
Acked-by: default avatarWill Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/20200102172413.654385-3-amanieu@gmail.com


Signed-off-by: default avatarChristian Brauner <christian.brauner@ubuntu.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bac64164

arch/arm64/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -139,6 +139,7 @@ config ARM64 
	select HAVE_CMPXCHG_DOUBLE

	select HAVE_CMPXCHG_LOCAL

	select HAVE_CONTEXT_TRACKING

	select HAVE_COPY_THREAD_TLS

	select HAVE_DEBUG_BUGVERBOSE

	select HAVE_DEBUG_KMEMLEAK

	select HAVE_DMA_CONTIGUOUS

arch/arm64/kernel/process.c

+5 −5
Original line number Diff line number Diff line
@@ -360,8 +360,8 @@ int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src) 


asmlinkage void ret_from_fork(void) asm("ret_from_fork");



int copy_thread(unsigned long clone_flags, unsigned long stack_start,

		unsigned long stk_sz, struct task_struct *p)

int copy_thread_tls(unsigned long clone_flags, unsigned long stack_start,

		unsigned long stk_sz, struct task_struct *p, unsigned long tls)

{

	struct pt_regs *childregs = task_pt_regs(p);
@@ -394,11 +394,11 @@ int copy_thread(unsigned long clone_flags, unsigned long stack_start, 
		}



		/*

		 * If a TLS pointer was passed to clone (4th argument), use it

		 * for the new thread.

		 * If a TLS pointer was passed to clone, use it for the new

		 * thread.

		 */

		if (clone_flags & CLONE_SETTLS)

			p->thread.uw.tp_value = childregs->regs[3];

			p->thread.uw.tp_value = tls;

	} else {

		memset(childregs, 0, sizeof(struct pt_regs));

		childregs->pstate = PSR_MODE_EL1h;