From: Catalin Marinas <catalin.marinas@arm.com>
Date: Thu, 14 Nov 2024 12:07:30 +0000 (+0000)
Subject: Merge branch 'for-next/pkey-signal' into for-next/core
X-Git-Tag: v6.13-rc1~203^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83ef4a378e563d085ddd7214c2a393116b5f3435;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'for-next/pkey-signal' into for-next/core

* for-next/pkey-signal:
  : Bring arm64 pkey signal delivery in line with the x86 behaviour
  selftests/mm: Fix unused function warning for aarch64_write_signal_pkey()
  selftests/mm: Define PKEY_UNRESTRICTED for pkey_sighandler_tests
  selftests/mm: Enable pkey_sighandler_tests on arm64
  selftests/mm: Use generic pkey register manipulation
  arm64: signal: Remove unused macro
  arm64: signal: Remove unnecessary check when saving POE state
  arm64: signal: Improve POR_EL0 handling to avoid uaccess failures
  firmware: arm_sdei: Fix the input parameter of cpuhp_remove_state()
  Revert "kasan: Disable Software Tag-Based KASAN with GCC"
  kasan: Fix Software Tag-Based KASAN with GCC
  kasan: Disable Software Tag-Based KASAN with GCC
  Documentation/protection-keys: add AArch64 to documentation
  arm64: set POR_EL0 for kernel threads

# Conflicts:
#	arch/arm64/kernel/signal.c
---

83ef4a378e563d085ddd7214c2a393116b5f3435
diff --cc arch/arm64/kernel/signal.c
index 2eb2e97a934f6,b077181a66c09..14ac6fdb872b9
--- a/arch/arm64/kernel/signal.c
+++ b/arch/arm64/kernel/signal.c
@@@ -1075,12 -981,9 +1132,12 @@@ SYSCALL_DEFINE0(rt_sigreturn
  	if (!access_ok(frame, sizeof (*frame)))
  		goto badframe;
  
- 	if (restore_sigframe(regs, frame))
+ 	if (restore_sigframe(regs, frame, &ua_state))
  		goto badframe;
  
 +	if (gcs_restore_signal())
 +		goto badframe;
 +
  	if (restore_altstack(&frame->uc.uc_stack))
  		goto badframe;
  
@@@ -1447,11 -1296,8 +1506,8 @@@ static int setup_return(struct pt_regs 
  		sme_smstop();
  	}
  
- 	if (system_supports_poe())
- 		write_sysreg_s(POR_EL0_INIT, SYS_POR_EL0);
- 
 -	if (ka->sa.sa_flags & SA_RESTORER)
 -		sigtramp = ka->sa.sa_restorer;
 +	if (ksig->ka.sa.sa_flags & SA_RESTORER)
 +		sigtramp = ksig->ka.sa.sa_restorer;
  	else
  		sigtramp = VDSO_SYMBOL(current->mm->context.vdso, sigtramp);
  
@@@ -1478,9 -1324,9 +1536,9 @@@ static int setup_rt_frame(int usig, str
  	__put_user_error(NULL, &frame->uc.uc_link, err);
  
  	err |= __save_altstack(&frame->uc.uc_stack, regs->sp);
- 	err |= setup_sigframe(&user, regs, set);
+ 	err |= setup_sigframe(&user, regs, set, &ua_state);
  	if (err == 0) {
 -		setup_return(regs, &ksig->ka, &user, usig);
 +		err = setup_return(regs, ksig, &user, usig);
  		if (ksig->ka.sa.sa_flags & SA_SIGINFO) {
  			err |= copy_siginfo_to_user(&frame->info, &ksig->info);
  			regs->regs[1] = (unsigned long)&frame->info;