[Midnightbsd-cvs] src [8794] trunk/usr.sbin/jail/command.c: handle when a process disappears before it can be tracked.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Sep 25 23:22:16 EDT 2016
Revision: 8794
http://svnweb.midnightbsd.org/src/?rev=8794
Author: laffer1
Date: 2016-09-25 23:22:15 -0400 (Sun, 25 Sep 2016)
Log Message:
-----------
handle when a process disappears before it can be tracked.
Modified Paths:
--------------
trunk/usr.sbin/jail/command.c
Modified: trunk/usr.sbin/jail/command.c
===================================================================
--- trunk/usr.sbin/jail/command.c 2016-09-26 03:19:43 UTC (rev 8793)
+++ trunk/usr.sbin/jail/command.c 2016-09-26 03:22:15 UTC (rev 8794)
@@ -66,7 +66,7 @@
extern char **environ;
static int run_command(struct cfjail *j);
-static void add_proc(struct cfjail *j, pid_t pid);
+static int add_proc(struct cfjail *j, pid_t pid);
static void clear_procs(struct cfjail *j);
static struct cfjail *find_proc(pid_t pid);
static int term_procs(struct cfjail *j);
@@ -542,13 +542,12 @@
if (pid < 0)
err(1, "fork");
if (pid > 0) {
- if (bg) {
+ if (bg || !add_proc(j, pid)) {
free(j->comline);
j->comline = NULL;
return 0;
} else {
paralimit--;
- add_proc(j, pid);
return 1;
}
}
@@ -622,7 +621,7 @@
/*
* Add a process to the hash, tied to a jail.
*/
-static void
+static int
add_proc(struct cfjail *j, pid_t pid)
{
struct kevent ke;
@@ -632,8 +631,11 @@
if (!kq && (kq = kqueue()) < 0)
err(1, "kqueue");
EV_SET(&ke, pid, EVFILT_PROC, EV_ADD, NOTE_EXIT, 0, NULL);
- if (kevent(kq, &ke, 1, NULL, 0, NULL) < 0)
+ if (kevent(kq, &ke, 1, NULL, 0, NULL) < 0) {
+ if (errno == ESRCH)
+ return 0;
err(1, "kevent");
+ }
ph = emalloc(sizeof(struct phash));
ph->j = j;
ph->pid = pid;
@@ -658,6 +660,7 @@
TAILQ_INSERT_TAIL(&sleeping, j, tq);
j->queue = &sleeping;
}
+ return 1;
}
/*
@@ -730,7 +733,7 @@
for (i = 0; i < pcnt; i++)
if (ki[i].ki_jid == j->jid &&
kill(ki[i].ki_pid, SIGTERM) == 0) {
- add_proc(j, ki[i].ki_pid);
+ (void)add_proc(j, ki[i].ki_pid);
if (verbose > 0) {
if (!noted) {
noted = 1;
More information about the Midnightbsd-cvs
mailing list