diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2012-11-06 08:27:19 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2012-12-12 10:52:07 -0500 |
commit | 9ec9b5ac239ebfff333c25c4a7d34649cb29e4e4 (patch) | |
tree | add188e2bf10446cc998cdc7b768c3aa7945ff95 | |
parent | 90c9e79f5dc5af4ea16ad56dda8b648d21037486 (diff) |
MIPS: Fix harmlessly missing else statement.
The actual bug is a missing else statement - but really this should be
expressed using a switch() statement.
Found by Al Viro who writes "the funny thing is, it *does* work only
because r2 is syscall number and syscall number around 512 => return
value being ENOSYS and not one of ERESTART... so we really can't hit
the first if and emerge from it with ERESTART_RESTARTBLOCK. still
wrong to write it that way..."
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r-- | arch/mips/kernel/signal.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/arch/mips/kernel/signal.c b/arch/mips/kernel/signal.c index 0e1a5b8ae817..b6aa77035019 100644 --- a/arch/mips/kernel/signal.c +++ b/arch/mips/kernel/signal.c | |||
@@ -568,17 +568,20 @@ static void do_signal(struct pt_regs *regs) | |||
568 | } | 568 | } |
569 | 569 | ||
570 | if (regs->regs[0]) { | 570 | if (regs->regs[0]) { |
571 | if (regs->regs[2] == ERESTARTNOHAND || | 571 | switch (regs->regs[2]) { |
572 | regs->regs[2] == ERESTARTSYS || | 572 | case ERESTARTNOHAND: |
573 | regs->regs[2] == ERESTARTNOINTR) { | 573 | case ERESTARTSYS: |
574 | case ERESTARTNOINTR: | ||
574 | regs->regs[2] = regs->regs[0]; | 575 | regs->regs[2] = regs->regs[0]; |
575 | regs->regs[7] = regs->regs[26]; | 576 | regs->regs[7] = regs->regs[26]; |
576 | regs->cp0_epc -= 4; | 577 | regs->cp0_epc -= 4; |
577 | } | 578 | break; |
578 | if (regs->regs[2] == ERESTART_RESTARTBLOCK) { | 579 | |
580 | case ERESTART_RESTARTBLOCK: | ||
579 | regs->regs[2] = current->thread.abi->restart; | 581 | regs->regs[2] = current->thread.abi->restart; |
580 | regs->regs[7] = regs->regs[26]; | 582 | regs->regs[7] = regs->regs[26]; |
581 | regs->cp0_epc -= 4; | 583 | regs->cp0_epc -= 4; |
584 | break; | ||
582 | } | 585 | } |
583 | regs->regs[0] = 0; /* Don't deal with this again. */ | 586 | regs->regs[0] = 0; /* Don't deal with this again. */ |
584 | } | 587 | } |