Page MenuHomeFreeBSD
Files F163264449

D21328.id61042.diff
No OneTemporary
Actions

D21328.id61042.diff
View Options

Index: usr.sbin/jail/state.c
===================================================================
--- usr.sbin/jail/state.c
+++ usr.sbin/jail/state.c
@@ -44,9 +44,9 @@
static int cmp_jailptr(const void *a, const void *b);
static int cmp_jailptr_name(const void *a, const void *b);
static struct cfjail *find_jail(const char *name);
-static int running_jid(const char *name, int flags);
+static struct cfjail *running_jail(const char *name, int flags);
-static struct cfjail **jails_byname;
+static struct cfjail **jails_byname = NULL;
static size_t njails;
/*
@@ -72,7 +72,7 @@
if ((j = TAILQ_FIRST(&cfjails)) &&
(p = j->intparams[IP_DEPEND])) {
TAILQ_FOREACH(s, &p->val, tq) {
- if (running_jid(s->s, 0) < 0) {
+ if (running_jail(s->s, 0) == NULL) {
warnx("depends on nonexistent jail "
"\"%s\"", s->s);
j->flags |= JF_FAILED;
@@ -369,11 +369,7 @@
j = find_jail(target);
if (j == NULL && state == JF_STOP) {
/* Allow -[rR] to specify a currently running jail. */
- if ((jid = running_jid(target, JAIL_DYING)) > 0) {
- j = add_jail();
- j->name = estrdup(target);
- j->jid = jid;
- }
+ j = running_jail(target, JAIL_DYING);
}
if (j == NULL) {
warnx("\"%s\" not found", target);
@@ -446,6 +442,9 @@
find_jail(const char *name)
{
struct cfjail **jp;
+
+ if (jails_byname == NULL)
+ return NULL;
jp = bsearch(name, jails_byname, njails, sizeof(struct cfjail *),
cmp_jailptr_name);
@@ -453,26 +452,46 @@
}
/*
- * Return the named jail's jid if it is running, and -1 if it isn't.
+ * Return jail if it is running, and NULL if it isn't.
*/
-static int
-running_jid(const char *name, int flags)
+static struct cfjail *
+running_jail(const char *name, int flags)
{
- struct iovec jiov[2];
+ struct iovec jiov[4];
+ struct cfjail *jail;
char *ep;
- int jid;
-
+ char jailname[MAXHOSTNAMELEN];
+ int jid, ret;
+
if ((jid = strtol(name, &ep, 10)) && !*ep) {
jiov[0].iov_base = __DECONST(char *, "jid");
jiov[0].iov_len = sizeof("jid");
jiov[1].iov_base = &jid;
jiov[1].iov_len = sizeof(jid);
+ jiov[2].iov_base = __DECONST(char *, "name");
+ jiov[2].iov_len = sizeof("name");
+ jiov[3].iov_base = &jailname;
+ jiov[3].iov_len = MAXHOSTNAMELEN;
} else {
jiov[0].iov_base = __DECONST(char *, "name");
jiov[0].iov_len = sizeof("name");
jiov[1].iov_len = strlen(name) + 1;
jiov[1].iov_base = alloca(jiov[1].iov_len);
strcpy(jiov[1].iov_base, name);
+ jiov[2].iov_base = __DECONST(char *, "name");
+ jiov[2].iov_len = sizeof("name");
+ jiov[3].iov_base = &jailname;
+ jiov[3].iov_len = MAXHOSTNAMELEN;
}
- return jail_get(jiov, 2, flags);
+
+ if ((ret = jail_get(jiov, 4, flags)) < 0)
+ return (NULL);
+
+ if ((jail = find_jail(jailname)) == NULL) {
+ jail = add_jail();
+ jail->name = estrdup(jailname);
+ jail->jid = ret;
+ }
+
+ return (jail);
}

File Metadata

Mime Type
text/plain
Expires
Wed, Jul 22, 1:59 PM (4 h, 57 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35363112
Default Alt Text
D21328.id61042.diff (2 KB)

Event Timeline