diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-04-28 17:51:42 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-05-21 14:38:24 -0400 |
commit | 21c1176a72bd019d513b26e05d491a31b50b18d2 (patch) | |
tree | f4b17999ea482335f50c2b7e5c2f8f5e9636fcba /arch/arm/kernel/signal.c | |
parent | d9be5ea6f9b6a51535ccdd9881ffb3be2dbd48e9 (diff) |
arm: if we get into work_pending while returning to kernel mode, just go away
checking in do_signal() is pointless - if we get there with !user_mode(regs)
(and we might), we'll end up looping indefinitely. Check in work_pending
and break out of the loop if so.
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/signal.c')
-rw-r--r-- | arch/arm/kernel/signal.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c index 3b37c14c47f5..6b37d4ddf0b6 100644 --- a/arch/arm/kernel/signal.c +++ b/arch/arm/kernel/signal.c | |||
@@ -609,15 +609,6 @@ static void do_signal(struct pt_regs *regs, int syscall) | |||
609 | int signr; | 609 | int signr; |
610 | 610 | ||
611 | /* | 611 | /* |
612 | * We want the common case to go fast, which | ||
613 | * is why we may in certain cases get here from | ||
614 | * kernel mode. Just return without doing anything | ||
615 | * if so. | ||
616 | */ | ||
617 | if (!user_mode(regs)) | ||
618 | return; | ||
619 | |||
620 | /* | ||
621 | * If we were from a system call, check for system call restarting... | 612 | * If we were from a system call, check for system call restarting... |
622 | */ | 613 | */ |
623 | if (syscall) { | 614 | if (syscall) { |