Skip to contentSkip to conversation

Ensure predictable endian state on signal handler entry

PATCH New Russell King - ARM Linux 2 participants 2 messages Feb 14, 2011 – Feb 15, 2011 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Ensure predictable endian state on signal handler entry

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.

--

 arch/arm/kernel/signal.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
arch/arm/kernel/signal.c +3 -1
index 907d5a6..abaf844 100644
@@ -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.
#1 lore raw

PATCH 1/1 Ensure predictable endian state on signal handler entry

Quoted 27 lines · Russell King - ARM Linux

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.

--

 arch/arm/kernel/signal.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
arch/arm/kernel/signal.c +3 -1
index 907d5a6..abaf844 100644
@@ -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.
Quoted 4 lines

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Looks sensible to me.

Only tested it with little-endian, but it's enough to make my silly test program not segfault. (Without your patch, it definitely does...)

#include <stdio.h>
#include <signal.h>
#include <string.h>
#include <unistd.h>

static void handler(int n)

{
	unsigned long cpsr;
#define FORMAT "handler: CPSR = 0x%08lX\n"
	char buf[sizeof FORMAT - 5 + 8];

	asm ("mrs %0, CPSR" : "=r" (cpsr));

	snprintf(buf, sizeof buf, FORMAT, cpsr);

	write(STDOUT_FILENO, buf, strlen(buf));
}

int main(void)

{
	signal(SIGINT, handler);

	asm volatile (
	"0:	setend	be\n\t"
	"	b 0b"
	);
}

Cheers
---Dave