svn commit: r363312 - stable/12/sys/kern

[Konstantin Belousov]

Author: kib
Date: Sat Jul 18 20:17:40 2020
New Revision: 363312
URL: https://svnweb.freebsd.org/changeset/base/363312

Log:
  Fix mismerge of r363038.
  
  The reset of p to NULL for non-curproc was missed, cauing ESRCH error not
  returned as it should be.
  
  Reported by:	lampa at fit.vutbr.cz
  PR:	248070

Modified:
  stable/12/sys/kern/kern_proc.c

Modified: stable/12/sys/kern/kern_proc.c
==============================================================================
--- stable/12/sys/kern/kern_proc.c	Sat Jul 18 18:19:57 2020	(r363311)
+++ stable/12/sys/kern/kern_proc.c	Sat Jul 18 20:17:40 2020	(r363312)
@@ -404,6 +404,7 @@ pget(pid_t pid, int flags, struct proc **pp)
 	if (p->p_pid == pid) {
 		PROC_LOCK(p);
 	} else {
+		p = NULL;
 		if (pid <= PID_MAX) {
 			sx_slock(&allproc_lock);
 			p = pfind_locked(pid);