diff options
| author |   Will Deacon <will@kernel.org> | 2020-06-22 12:35:41 +0100 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2020-06-23 14:47:03 +0100 |
| commit | a39060b009ca0b5b5fe0c0dab85ed437531aab52 (patch) | |
| tree | 735f34e4e687056048ef3da0e75d98a9dbe12ba9 /arch/arm64/kernel/signal32.c | |
| parent | arm64: vdso: Disable dwarf unwinding through the sigreturn trampoline (diff) | |
| download | linux-dev-a39060b009ca0b5b5fe0c0dab85ed437531aab52.tar.xz linux-dev-a39060b009ca0b5b5fe0c0dab85ed437531aab52.zip | |
arm64: compat: Allow 32-bit vdso and sigpage to co-exist
In preparation for removing the signal trampoline from the compat vDSO,
allow the sigpage and the compat vDSO to co-exist.
For the moment the vDSO signal trampoline will still be used when built.
Subsequent patches will move to the sigpage consistently.
Acked-by: Dave Martin <Dave.Martin@arm.com>
Reviewed-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
Reviewed-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'arch/arm64/kernel/signal32.c')
| -rw-r--r-- | arch/arm64/kernel/signal32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/signal32.c b/arch/arm64/kernel/signal32.c index 82feca6f7052..0aa0b33744de 100644 --- a/arch/arm64/kernel/signal32.c +++ b/arch/arm64/kernel/signal32.c @@ -371,7 +371,7 @@ static void compat_setup_return(struct pt_regs *regs, struct k_sigaction *ka, if (ka->sa.sa_flags & SA_SIGINFO) idx += 3; - retcode = (unsigned long)current->mm->context.vdso + + retcode = (unsigned long)current->mm->context.sigpage + (idx << 2) + thumb; #endif } |