From 5f9ce489aae8bf61982119b0522873aeb5ddfbbf Mon Sep 17 00:00:00 2001
From: robert <robert@FreeBSD.org>
Date: Thu, 17 Jul 2003 22:44:41 +0000
Subject: Correct six return statements which returned zero instead of an
 appropriate error number after a failure condition.

In particular, three of the changed statements return ESRCH for a
failed pfind(), and in also three places a non-zero return
from p_cansee() will be passed back,

Also noticed by:	rwatson
---
 sys/kern/kern_proc.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'sys/kern/kern_proc.c')

diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index e4981e2..4cbb04f 100644
--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@@ -912,10 +912,10 @@ sysctl_kern_proc(SYSCTL_HANDLER_ARGS)
 			return (EINVAL);
 		p = pfind((pid_t)name[0]);
 		if (!p)
-			return (0);
-		if (p_cansee(curthread, p)) {
+			return (ESRCH);
+		if ((error = p_cansee(curthread, p))) {
 			PROC_UNLOCK(p);
-			return (0);
+			return (error);
 		}
 		error = sysctl_out_proc(p, req, KERN_PROC_NOTHREADS);
 		return (error);
@@ -1091,11 +1091,11 @@ sysctl_kern_proc_args(SYSCTL_HANDLER_ARGS)
 
 	p = pfind((pid_t)name[0]);
 	if (!p)
-		return (0);
+		return (ESRCH);
 
-	if ((!ps_argsopen) && p_cansee(curthread, p)) {
+	if ((!ps_argsopen) && (error = p_cansee(curthread, p))) {
 		PROC_UNLOCK(p);
-		return (0);
+		return (error);
 	}
 
 	if (req->newptr && curproc != p) {
@@ -1135,6 +1135,7 @@ sysctl_kern_proc_sv_name(SYSCTL_HANDLER_ARGS)
 	char *sv_name;
 	int *name;
 	int namelen;
+	int error;
 
 	namelen = arg2;
 	if (namelen != 1) 
@@ -1142,10 +1143,10 @@ sysctl_kern_proc_sv_name(SYSCTL_HANDLER_ARGS)
 
 	name = (int *)arg1;
 	if ((p = pfind((pid_t)name[0])) == NULL)
-		return (0);
-	if (p_cansee(curthread, p)) {
+		return (ESRCH);
+	if ((error = p_cansee(curthread, p))) {
 		PROC_UNLOCK(p);
-		return (0);
+		return (error);
 	}
 	sv_name = p->p_sysent->sv_name;
 	PROC_UNLOCK(p);
-- 
cgit v1.1