d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kern_ptrace: change type of proctree_locked to bool

Browse Source 
Tested by:	pho
Sponsored by:	The FreeBSD Foundation
MFC after:	1 week
Differential revision:	https://reviews.freebsd.org/D29955
This commit is contained in:
Konstantin Belousov 2021-05-01 00:14:26 +03:00
parent af928fded0
commit 2bd0506c8d
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/kern/sys_process.c
View File

@ -612,13 +612,14 @@ kern_ptrace(struct thread *td, int req, pid_t pid, void *addr, int data)
struct ptrace_lwpinfo *pl; struct ptrace_lwpinfo *pl;
struct ptrace_sc_ret *psr; struct ptrace_sc_ret *psr;
int error, num, tmp; int error, num, tmp;
int proctree_locked = 0;
lwpid_t tid = 0, *buf; lwpid_t tid = 0, *buf;
#ifdef COMPAT_FREEBSD32 #ifdef COMPAT_FREEBSD32
int wrap32 = 0, safe = 0; int wrap32 = 0, safe = 0;
#endif #endif
bool proctree_locked;
curp = td->td_proc; curp = td->td_proc;
proctree_locked = false;
/* Lock proctree before locking the process. */ /* Lock proctree before locking the process. */
switch (req) { switch (req) {
@ -636,7 +637,7 @@ kern_ptrace(struct thread *td, int req, pid_t pid, void *addr, int data)
case PT_DETACH: case PT_DETACH:
case PT_GET_SC_ARGS: case PT_GET_SC_ARGS:
sx_xlock(&proctree_lock); sx_xlock(&proctree_lock);
proctree_locked = 1; proctree_locked = true;
break; break;
default: default:
break; break;
@ -816,7 +817,7 @@ kern_ptrace(struct thread *td, int req, pid_t pid, void *addr, int data)
p->p_oppid); p->p_oppid);
sx_xunlock(&proctree_lock); sx_xunlock(&proctree_lock);
proctree_locked = 0; proctree_locked = false;
MPASS(p->p_xthread == NULL); MPASS(p->p_xthread == NULL);
MPASS((p->p_flag & P_STOPPED_TRACE) == 0); MPASS((p->p_flag & P_STOPPED_TRACE) == 0);
@ -1053,10 +1054,10 @@ kern_ptrace(struct thread *td, int req, pid_t pid, void *addr, int data)
} }
sx_xunlock(&proctree_lock); sx_xunlock(&proctree_lock);
proctree_locked = 0; proctree_locked = false;
sendsig: sendsig:
MPASS(proctree_locked == 0); MPASS(!proctree_locked);
/* /*
* Clear the pending event for the thread that just * Clear the pending event for the thread that just