The branch main has been updated by kib:
URL:
https://cgit.FreeBSD.org/src/commit/?id=a091c353235e0ee97d2531e80d9d64e1648350f4
commit a091c353235e0ee97d2531e80d9d64e1648350f4
Author: Konstantin Belousov <k...@freebsd.org>
AuthorDate: 2021-04-11 09:06:21 +0000
Commit: Konstantin Belousov <k...@freebsd.org>
CommitDate: 2021-04-11 11:44:30 +0000
ptrace: restructure comments around reparenting on PT_DETACH
style code, and use {} for both branches.
Sponsored by: The FreeBSD Foundation
MFC after: 1 week
---
sys/kern/sys_process.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c
index 99bb2e992208..c4dfc2def72a 100644
--- a/sys/kern/sys_process.c
+++ b/sys/kern/sys_process.c
@@ -1005,14 +1005,16 @@ kern_ptrace(struct thread *td, int req, pid_t pid, void
*addr, int data)
break;
case PT_DETACH:
/*
- * Reset the process parent.
- *
- * NB: This clears P_TRACED before reparenting
+ * Clear P_TRACED before reparenting
* a detached process back to its original
* parent. Otherwise the debugee will be set
* as an orphan of the debugger.
*/
p->p_flag &= ~(P_TRACED | P_WAITED);
+
+ /*
+ * Reset the process parent.
+ */
if (p->p_oppid != p->p_pptr->p_pid) {
PROC_LOCK(p->p_pptr);
sigqueue_take(p->p_ksi);
@@ -1025,9 +1027,11 @@ kern_ptrace(struct thread *td, int req, pid_t pid, void
*addr, int data)
CTR3(KTR_PTRACE,
"PT_DETACH: pid %d reparented to pid %d, sig %d",
p->p_pid, pp->p_pid, data);
- } else
+ } else {
CTR2(KTR_PTRACE, "PT_DETACH: pid %d, sig %d",
p->p_pid, data);
+ }
+
p->p_ptevents = 0;
FOREACH_THREAD_IN_PROC(p, td3) {
if ((td3->td_dbgflags & TDB_FSTP) != 0) {
_______________________________________________
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
