Skip to content

Commit

Permalink
arm: if we get into work_pending while returning to kernel mode, just…
Browse files Browse the repository at this point in the history
… 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>
  • Loading branch information
Al Viro committed May 21, 2012
1 parent d9be5ea commit 21c1176
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 9 deletions.
3 changes: 3 additions & 0 deletions arch/arm/kernel/entry-common.S
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,10 @@ work_pending:
/*
* TIF_SIGPENDING or TIF_NOTIFY_RESUME must've been set if we got here
*/
ldr r2, [sp, #S_PSR]
mov r0, sp @ 'regs'
tst r2, #15 @ are we returning to user mode?
bne no_work_pending @ no? just leave, then...
mov r2, why @ 'syscall'
tst r1, #_TIF_SIGPENDING @ delivering a signal?
movne why, #0 @ prevent further restarts
Expand Down
9 changes: 0 additions & 9 deletions arch/arm/kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -608,15 +608,6 @@ static void do_signal(struct pt_regs *regs, int syscall)
siginfo_t info;
int signr;

/*
* We want the common case to go fast, which
* is why we may in certain cases get here from
* kernel mode. Just return without doing anything
* if so.
*/
if (!user_mode(regs))
return;

/*
* If we were from a system call, check for system call restarting...
*/
Expand Down

0 comments on commit 21c1176

Please sign in to comment.