Make KERN_FILE_BYPID return ESRCH when PID not found, both in sysctl and

offline paths. More polishing to come.

Input and okay bluhm@ & kettenis@.

1 files changed, 14 insertions, 6 deletions

diff --git a/lib/libkvm/kvm_file2.c b/lib/libkvm/kvm_file2.c
index db267196c68..087b9abf296 100644
--- a/lib/libkvm/kvm_file2.c
+++ b/lib/libkvm/kvm_file2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kvm_file2.c,v 1.48 2016/04/25 20:42:55 tedu Exp $	*/
+/*	$OpenBSD: kvm_file2.c,v 1.49 2016/05/04 01:28:42 zhuk Exp $	*/
 
 /*
  * Copyright (c) 2009 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -148,7 +148,7 @@ kvm_getfiles(kvm_t *kd, int op, int arg, size_t esize, int *cnt)
 			/* find size and alloc buffer */
 			rv = sysctl(mib, 6, NULL, &size, NULL, 0);
 			if (rv == -1) {
-				if (kd->vmfd != -1)
+				if (errno != ESRCH && kd->vmfd != -1)
 					goto deadway;
 				_kvm_syserr(kd, kd->program, "kvm_getfiles");
 				return (NULL);
@@ -265,7 +265,7 @@ kvm_deadfile_byid(kvm_t *kd, int op, int arg, size_t esize, int *cnt)
 {
 	size_t buflen;
 	struct nlist nl[4], *np;
-	int n = 0;
+	int n = 0, matched = 0;
 	char *where;
 	struct kinfo_file kf;
 	struct file *fp, file;
@@ -311,6 +311,9 @@ kvm_deadfile_byid(kvm_t *kd, int op, int arg, size_t esize, int *cnt)
 	kd->filebase = (void *)where;
 	buflen = (nfiles + 10) * esize;
 
+	if (op != KERN_FILE_BYPID || arg <= 0)
+		matched = 1;
+
 	for (pr = LIST_FIRST(&allprocess);
 	    pr != NULL;
 	    pr = LIST_NEXT(&process, ps_list)) {
@@ -332,10 +335,11 @@ kvm_deadfile_byid(kvm_t *kd, int op, int arg, size_t esize, int *cnt)
 			goto cleanup;
 		}
 
-		if (op == KERN_FILE_BYPID && arg > 0 &&
-		    proc.p_pid != (pid_t)arg) {
-				/* not the pid we are looking for */
+		if (op == KERN_FILE_BYPID) {
+			/* check if this is the pid we are looking for */
+			if (arg > 0 && proc.p_pid != (pid_t)arg)
 				continue;
+			matched = 1;
 		}
 
 		if (KREAD(kd, (u_long)process.ps_ucred, &ucred)) {
@@ -457,6 +461,10 @@ kvm_deadfile_byid(kvm_t *kd, int op, int arg, size_t esize, int *cnt)
 			n++;
 		}
 	}
+	if (!matched) {
+		errno = ESRCH;
+		goto cleanup;
+	}
 done:
 	*cnt = n;
 	free(filebuf);