diff options
| author | Al Viro <viro@ZenIV.linux.org.uk> | 2010-11-04 11:13:59 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2010-12-16 18:10:52 +0000 |
| commit | a989ff898f9740651d00388c33bdf4f2a7914920 (patch) | |
| tree | 9f8ca387b8773c19ca4f2556c509ef3381b86abd | |
| parent | 2b3e50234eafc40a04f5f4a2b7bb24b506fd7e87 (diff) | |
| download | linux-3.10-a989ff898f9740651d00388c33bdf4f2a7914920.tar.gz linux-3.10-a989ff898f9740651d00388c33bdf4f2a7914920.tar.bz2 linux-3.10-a989ff898f9740651d00388c33bdf4f2a7914920.zip | |
MIPS: Don't stomp on caller's ->regs[2] in copy_thread()
We never needed that (->regs[2] is overwritten on return from syscall paths
with return value of syscall, so storing it there early made no sense) and
with new restart logics since d27240bf7e61d2656de18e158ec910a902030847 it
has become really bad - we lose the original syscall number before the
place where we decide that we might need a syscall restart.
Note that for child we do need the assignment to regs[2] - it won't go
through the normal return from syscall path.
[Ralf: Issue found and reported by Lluís; initial investigations by me;
bug finally found and patch by Al; testing by me and Lluís.]
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Tested-by: Lluís Batlle i Rossell <viriketo@gmail.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| -rw-r--r-- | arch/mips/kernel/process.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c index 99960940d4a..ae167df73dd 100644 --- a/arch/mips/kernel/process.c +++ b/arch/mips/kernel/process.c @@ -142,7 +142,6 @@ int copy_thread(unsigned long clone_flags, unsigned long usp, childregs->regs[7] = 0; /* Clear error flag */ childregs->regs[2] = 0; /* Child gets zero as return value */ - regs->regs[2] = p->pid; if (childregs->cp0_status & ST0_CU0) { childregs->regs[28] = (unsigned long) ti; |