git: 66e0bf766854 - stable/14 - kcmp_pget(): add an assert that we did not hold the current process

From: Konstantin Belousov <kib_at_FreeBSD.org>
Date: Fri, 03 May 2024 00:26:05 UTC
The branch stable/14 has been updated by kib:

URL: https://cgit.FreeBSD.org/src/commit/?id=66e0bf7668548f3bb98dfaf92938b7ebf953b5d2

commit 66e0bf7668548f3bb98dfaf92938b7ebf953b5d2
Author:     Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2024-04-29 18:51:53 +0000
Commit:     Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2024-05-03 00:25:33 +0000

    kcmp_pget(): add an assert that we did not hold the current process
    
    (cherry picked from commit 1e01650a787028fd558e8cb709c232e335fc2cd9)
---
 sys/kern/sys_generic.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c
index f3fd39079a82..dd845e653929 100644
--- a/sys/kern/sys_generic.c
+++ b/sys/kern/sys_generic.c
@@ -2094,11 +2094,15 @@ kcmp_cmp(uintptr_t a, uintptr_t b)
 static int
 kcmp_pget(struct thread *td, pid_t pid, struct proc **pp)
 {
+	int error;
+
 	if (pid == td->td_proc->p_pid) {
 		*pp = td->td_proc;
 		return (0);
 	}
-	return (pget(pid, PGET_CANDEBUG | PGET_NOTWEXIT | PGET_HOLD, pp));
+	error = pget(pid, PGET_CANDEBUG | PGET_NOTWEXIT | PGET_HOLD, pp);
+	MPASS(*pp != td->td_proc);
+	return (error);
 }
 
 int