From 46ec41ecb40c33ffbe7663d4a056cbd6bdbc3255 Mon Sep 17 00:00:00 2001 From: David Schultz Date: Fri, 1 Oct 2004 05:01:00 +0000 Subject: [PATCH] Fix the following race: 1. Process p1 is currently being swapped in. 2. Process p2 calls linux_ptrace(PTRACE_GETFPXREGS, p1_pid, ...) 3. After acquiring a reference to FIRST_THREAD_IN_PROC(p1), p2 blocks in faultin() while p1 finishes being swapped in. This means p2 won't get back the lock on p1 until after p1's threads are runnable. 4. After p1 is swapped in, the first thread in p1 exits. 5. p2 now uses its dangling reference to p1's first thread. --- sys/i386/linux/linux_ptrace.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/i386/linux/linux_ptrace.c b/sys/i386/linux/linux_ptrace.c index 9cee4411a1f..6d61ce4428f 100644 --- a/sys/i386/linux/linux_ptrace.c +++ b/sys/i386/linux/linux_ptrace.c @@ -386,9 +386,9 @@ linux_ptrace(struct thread *td, struct linux_ptrace_args *uap) goto fail; } - td2 = FIRST_THREAD_IN_PROC(p); if (req == PTRACE_GETFPXREGS) { - _PHOLD(p); + _PHOLD(p); /* may block */ + td2 = FIRST_THREAD_IN_PROC(p); error = linux_proc_read_fpxregs(td2, &r.fpxreg); _PRELE(p); PROC_UNLOCK(p); @@ -398,7 +398,8 @@ linux_ptrace(struct thread *td, struct linux_ptrace_args *uap) } else { /* clear dangerous bits exactly as Linux does*/ r.fpxreg.mxcsr &= 0xffbf; - _PHOLD(p); + _PHOLD(p); /* may block */ + td2 = FIRST_THREAD_IN_PROC(p); error = linux_proc_write_fpxregs(td2, &r.fpxreg); _PRELE(p); PROC_UNLOCK(p);