Skip to content

Commit

Permalink
Revert "um: Fix wait_stub_done() error handling"
Browse files Browse the repository at this point in the history
This reverts commit 0974a9c.
The real for for that issue is to release current->mm->mmap_sem in
fix_range_common().

Signed-off-by: Richard Weinberger <richard@nod.at>
  • Loading branch information
richardweinberger committed Jul 20, 2014
1 parent d057190 commit ae5db6d
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions arch/um/os-Linux/skas/process.c
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ static int ptrace_dump_regs(int pid)

void wait_stub_done(int pid)
{
int n, status, err, bad_stop = 0;
int n, status, err;

while (1) {
CATCH_EINTR(n = waitpid(pid, &status, WUNTRACED | __WALL));
Expand All @@ -74,8 +74,6 @@ void wait_stub_done(int pid)

if (((1 << WSTOPSIG(status)) & STUB_DONE_MASK) != 0)
return;
else
bad_stop = 1;

bad_wait:
err = ptrace_dump_regs(pid);
Expand All @@ -85,10 +83,7 @@ void wait_stub_done(int pid)
printk(UM_KERN_ERR "wait_stub_done : failed to wait for SIGTRAP, "
"pid = %d, n = %d, errno = %d, status = 0x%x\n", pid, n, errno,
status);
if (bad_stop)
kill(pid, SIGKILL);
else
fatal_sigsegv();
fatal_sigsegv();
}

extern unsigned long current_stub_stack(void);
Expand Down

0 comments on commit ae5db6d

Please sign in to comment.