shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

[ARM] Add code to prevent system calls from being restarted muliple times before returning from the kernel.

Browse Source 
Fixes crashes with thumb syscalls.
This commit is contained in:
Arve Hjønnevåg
2007-04-09 17:13:02 +07:00
parent 39078ee4d1
commit 85d747b476
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
arch/arm/kernel/signal.c
View File

@@ -517,6 +517,14 @@ setup_rt_frame(int usig, struct k_sigaction *ka, siginfo_t *info,
static inline void setup_syscall_restart(struct pt_regs *regs)
{
if (regs->ARM_ORIG_r0 == -ERESTARTNOHAND ||
regs->ARM_ORIG_r0 == -ERESTARTSYS ||
regs->ARM_ORIG_r0 == -ERESTARTNOINTR ||
regs->ARM_ORIG_r0 == -ERESTART_RESTARTBLOCK) {
/* the syscall cannot be safely restarted, return -EINTR instead */
regs->ARM_r0 = -EINTR;
return;
}
regs->ARM_r0 = regs->ARM_ORIG_r0;
regs->ARM_pc -= thumb_mode(regs) ? 2 : 4;
}
@@ -649,6 +657,7 @@ static void do_signal(struct pt_regs *regs, int syscall)
*/
if (syscall) {
if (regs->ARM_r0 == -ERESTART_RESTARTBLOCK) {
regs->ARM_r0 = -EAGAIN; /* prevent multiple restarts */
if (thumb_mode(regs)) {
regs->ARM_r7 = __NR_restart_syscall - __NR_SYSCALL_BASE;
regs->ARM_pc -= 2;