diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-02-20 12:22:52 +0000 |
|---|---|---|
| committer | AK <andi@firstfloor.org> | 2011-03-31 11:58:08 -0700 |
| commit | 7d13ddf6579f7a201201765315cf1a969226dde7 (patch) | |
| tree | 3587fe1a01e1d8712692f9fd5a918ce68609a543 /arch | |
| parent | 6f1b1e1384b23cfab30c2bc02a8f94927274c10d (diff) | |
ARM: Ensure predictable endian state on signal handler entry
commit 53399053eb505cf541b2405bd9d9bca5ecfb96fb upstream.
Ensure a predictable endian state when entering signal handlers. This
avoids programs which use SETEND to momentarily switch their endian
state from having their signal handlers entered with an unpredictable
endian state.
Acked-by: Dave Martin <dave.martin@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/kernel/signal.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c index 907d5a620bc..abaf8445ce2 100644 --- a/arch/arm/kernel/signal.c +++ b/arch/arm/kernel/signal.c @@ -474,7 +474,9 @@ setup_return(struct pt_regs *regs, struct k_sigaction *ka, unsigned long handler = (unsigned long)ka->sa.sa_handler; unsigned long retcode; int thumb = 0; - unsigned long cpsr = regs->ARM_cpsr & ~PSR_f; + unsigned long cpsr = regs->ARM_cpsr & ~(PSR_f | PSR_E_BIT); + + cpsr |= PSR_ENDSTATE; /* * Maybe we need to deliver a 32-bit signal to a 26-bit task. |