Index: stable/10/usr.sbin/jail/command.c =================================================================== --- stable/10/usr.sbin/jail/command.c (revision 294483) +++ stable/10/usr.sbin/jail/command.c (revision 294484) @@ -1,980 +1,981 @@ /*- * Copyright (c) 2011 James Gritton * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ #include __FBSDID("$FreeBSD$"); #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include "jailp.h" #define DEFAULT_STOP_TIMEOUT 10 #define PHASH_SIZE 256 LIST_HEAD(phhead, phash); struct phash { LIST_ENTRY(phash) le; struct cfjail *j; pid_t pid; }; int paralimit = -1; extern char **environ; static int run_command(struct cfjail *j); 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); static int get_user_info(struct cfjail *j, const char *username, const struct passwd **pwdp, login_cap_t **lcapp); static int check_path(struct cfjail *j, const char *pname, const char *path, int isfile, const char *umount_type); static struct cfjails sleeping = TAILQ_HEAD_INITIALIZER(sleeping); static struct cfjails runnable = TAILQ_HEAD_INITIALIZER(runnable); static struct cfstring dummystring = { .len = 1 }; static struct phhead phash[PHASH_SIZE]; static int kq; /* * Run the next command associated with a jail. */ int next_command(struct cfjail *j) { enum intparam comparam; int create_failed, stopping; if (paralimit == 0) { requeue(j, &runnable); return 1; } create_failed = (j->flags & (JF_STOP | JF_FAILED)) == JF_FAILED; stopping = (j->flags & JF_STOP) != 0; comparam = *j->comparam; for (;;) { if (j->comstring == NULL) { j->comparam += create_failed ? -1 : 1; switch ((comparam = *j->comparam)) { case IP__NULL: return 0; case IP_MOUNT_DEVFS: if (!bool_param(j->intparams[IP_MOUNT_DEVFS])) continue; j->comstring = &dummystring; break; case IP_MOUNT_FDESCFS: if (!bool_param(j->intparams[IP_MOUNT_FDESCFS])) continue; j->comstring = &dummystring; break; case IP_MOUNT_PROCFS: if (!bool_param(j->intparams[IP_MOUNT_PROCFS])) continue; j->comstring = &dummystring; break; case IP__OP: case IP_STOP_TIMEOUT: j->comstring = &dummystring; break; default: if (j->intparams[comparam] == NULL) continue; j->comstring = create_failed || (stopping && (j->intparams[comparam]->flags & PF_REV)) ? TAILQ_LAST(&j->intparams[comparam]->val, cfstrings) : TAILQ_FIRST(&j->intparams[comparam]->val); } } else { j->comstring = j->comstring == &dummystring ? NULL : create_failed || (stopping && (j->intparams[comparam]->flags & PF_REV)) ? TAILQ_PREV(j->comstring, cfstrings, tq) : TAILQ_NEXT(j->comstring, tq); } if (j->comstring == NULL || j->comstring->len == 0 || (create_failed && (comparam == IP_EXEC_PRESTART || comparam == IP_EXEC_START || comparam == IP_COMMAND || comparam == IP_EXEC_POSTSTART))) continue; switch (run_command(j)) { case -1: failed(j); /* FALLTHROUGH */ case 1: return 1; } } } /* * Check command exit status */ int finish_command(struct cfjail *j) { int error; if (!(j->flags & JF_SLEEPQ)) return 0; j->flags &= ~JF_SLEEPQ; if (*j->comparam == IP_STOP_TIMEOUT) { j->flags &= ~JF_TIMEOUT; j->pstatus = 0; return 0; } paralimit++; if (!TAILQ_EMPTY(&runnable)) requeue(TAILQ_FIRST(&runnable), &ready); error = 0; if (j->flags & JF_TIMEOUT) { j->flags &= ~JF_TIMEOUT; if (*j->comparam != IP_STOP_TIMEOUT) { jail_warnx(j, "%s: timed out", j->comline); failed(j); error = -1; } else if (verbose > 0) jail_note(j, "timed out\n"); } else if (j->pstatus != 0) { if (WIFSIGNALED(j->pstatus)) jail_warnx(j, "%s: exited on signal %d", j->comline, WTERMSIG(j->pstatus)); else jail_warnx(j, "%s: failed", j->comline); j->pstatus = 0; failed(j); error = -1; } free(j->comline); j->comline = NULL; return error; } /* * Check for finished processes or timeouts. */ struct cfjail * next_proc(int nonblock) { struct kevent ke; struct timespec ts; struct timespec *tsp; struct cfjail *j; if (!TAILQ_EMPTY(&sleeping)) { again: tsp = NULL; if ((j = TAILQ_FIRST(&sleeping)) && j->timeout.tv_sec) { clock_gettime(CLOCK_REALTIME, &ts); ts.tv_sec = j->timeout.tv_sec - ts.tv_sec; ts.tv_nsec = j->timeout.tv_nsec - ts.tv_nsec; if (ts.tv_nsec < 0) { ts.tv_sec--; ts.tv_nsec += 1000000000; } if (ts.tv_sec < 0 || (ts.tv_sec == 0 && ts.tv_nsec == 0)) { j->flags |= JF_TIMEOUT; clear_procs(j); return j; } tsp = &ts; } if (nonblock) { ts.tv_sec = 0; ts.tv_nsec = 0; tsp = &ts; } switch (kevent(kq, NULL, 0, &ke, 1, tsp)) { case -1: if (errno != EINTR) err(1, "kevent"); goto again; case 0: if (!nonblock) { j = TAILQ_FIRST(&sleeping); j->flags |= JF_TIMEOUT; clear_procs(j); return j; } break; case 1: (void)waitpid(ke.ident, NULL, WNOHANG); if ((j = find_proc(ke.ident))) { j->pstatus = ke.data; return j; } goto again; } } return NULL; } /* * Run a single command for a jail, possible inside the jail. */ static int run_command(struct cfjail *j) { const struct passwd *pwd; const struct cfstring *comstring, *s; login_cap_t *lcap; char **argv; char *cs, *comcs, *devpath; const char *jidstr, *conslog, *path, *ruleset, *term, *username; enum intparam comparam; size_t comlen; pid_t pid; int argc, bg, clean, consfd, down, fib, i, injail, sjuser, timeout; #if defined(INET) || defined(INET6) char *addr, *extrap, *p, *val; #endif static char *cleanenv; /* Perform some operations that aren't actually commands */ comparam = *j->comparam; down = j->flags & (JF_STOP | JF_FAILED); switch (comparam) { case IP_STOP_TIMEOUT: return term_procs(j); case IP__OP: if (down) { if (jail_remove(j->jid) < 0 && errno == EPERM) { jail_warnx(j, "jail_remove: %s", strerror(errno)); return -1; } if (verbose > 0 || (verbose == 0 && (j->flags & JF_STOP ? note_remove : j->name != NULL))) jail_note(j, "removed\n"); j->jid = -1; if (j->flags & JF_STOP) dep_done(j, DF_LIGHT); else j->flags &= ~JF_PERSIST; } else { if (create_jail(j) < 0) return -1; if (iflag) printf("%d\n", j->jid); if (verbose >= 0 && (j->name || verbose > 0)) jail_note(j, "created\n"); dep_done(j, DF_LIGHT); } return 0; default: ; } /* * Collect exec arguments. Internal commands for network and * mounting build their own argument lists. */ comstring = j->comstring; bg = 0; switch (comparam) { #ifdef INET case IP__IP4_IFADDR: argc = 0; val = alloca(strlen(comstring->s) + 1); strcpy(val, comstring->s); cs = val; extrap = NULL; while ((p = strchr(cs, ' ')) != NULL && strlen(p) > 1) { if (extrap == NULL) { *p = '\0'; extrap = p + 1; } cs = p + 1; argc++; } argv = alloca((8 + argc) * sizeof(char *)); *(const char **)&argv[0] = _PATH_IFCONFIG; if ((cs = strchr(val, '|'))) { argv[1] = alloca(cs - val + 1); strlcpy(argv[1], val, cs - val + 1); addr = cs + 1; } else { *(const char **)&argv[1] = string_param(j->intparams[IP_INTERFACE]); addr = val; } *(const char **)&argv[2] = "inet"; if (!(cs = strchr(addr, '/'))) { argv[3] = addr; *(const char **)&argv[4] = "netmask"; *(const char **)&argv[5] = "255.255.255.255"; argc = 6; } else if (strchr(cs + 1, '.')) { argv[3] = alloca(cs - addr + 1); strlcpy(argv[3], addr, cs - addr + 1); *(const char **)&argv[4] = "netmask"; *(const char **)&argv[5] = cs + 1; argc = 6; } else { argv[3] = addr; argc = 4; } if (!down) { for (cs = strtok(extrap, " "); cs; cs = strtok(NULL, " ")) { size_t len = strlen(cs) + 1; argv[argc] = alloca(len); strlcpy(argv[argc++], cs, len); } } *(const char **)&argv[argc] = down ? "-alias" : "alias"; argv[argc + 1] = NULL; break; #endif #ifdef INET6 case IP__IP6_IFADDR: argc = 0; val = alloca(strlen(comstring->s) + 1); strcpy(val, comstring->s); cs = val; extrap = NULL; while ((p = strchr(cs, ' ')) != NULL && strlen(p) > 1) { if (extrap == NULL) { *p = '\0'; extrap = p + 1; } cs = p + 1; argc++; } argv = alloca((8 + argc) * sizeof(char *)); *(const char **)&argv[0] = _PATH_IFCONFIG; if ((cs = strchr(val, '|'))) { argv[1] = alloca(cs - val + 1); strlcpy(argv[1], val, cs - val + 1); addr = cs + 1; } else { *(const char **)&argv[1] = string_param(j->intparams[IP_INTERFACE]); addr = val; } *(const char **)&argv[2] = "inet6"; argv[3] = addr; if (!(cs = strchr(addr, '/'))) { *(const char **)&argv[4] = "prefixlen"; *(const char **)&argv[5] = "128"; argc = 6; } else argc = 4; if (!down) { for (cs = strtok(extrap, " "); cs; cs = strtok(NULL, " ")) { size_t len = strlen(cs) + 1; argv[argc] = alloca(len); strlcpy(argv[argc++], cs, len); } } *(const char **)&argv[argc] = down ? "-alias" : "alias"; argv[argc + 1] = NULL; break; #endif case IP_VNET_INTERFACE: argv = alloca(5 * sizeof(char *)); *(const char **)&argv[0] = _PATH_IFCONFIG; argv[1] = comstring->s; *(const char **)&argv[2] = down ? "-vnet" : "vnet"; jidstr = string_param(j->intparams[KP_JID]); *(const char **)&argv[3] = jidstr ? jidstr : string_param(j->intparams[KP_NAME]); argv[4] = NULL; break; case IP_MOUNT: case IP__MOUNT_FROM_FSTAB: argv = alloca(8 * sizeof(char *)); comcs = alloca(comstring->len + 1); strcpy(comcs, comstring->s); argc = 0; for (cs = strtok(comcs, " \t\f\v\r\n"); cs && argc < 4; cs = strtok(NULL, " \t\f\v\r\n")) argv[argc++] = cs; if (argc == 0) return 0; if (argc < 3) { jail_warnx(j, "%s: %s: missing information", j->intparams[comparam]->name, comstring->s); return -1; } if (check_path(j, j->intparams[comparam]->name, argv[1], 0, down ? argv[2] : NULL) < 0) return -1; if (down) { argv[4] = NULL; argv[3] = argv[1]; *(const char **)&argv[0] = "/sbin/umount"; } else { if (argc == 4) { argv[7] = NULL; argv[6] = argv[1]; argv[5] = argv[0]; argv[4] = argv[3]; *(const char **)&argv[3] = "-o"; } else { argv[5] = NULL; argv[4] = argv[1]; argv[3] = argv[0]; } *(const char **)&argv[0] = _PATH_MOUNT; } *(const char **)&argv[1] = "-t"; break; case IP_MOUNT_DEVFS: argv = alloca(7 * sizeof(char *)); path = string_param(j->intparams[KP_PATH]); if (path == NULL) { jail_warnx(j, "mount.devfs: no path"); return -1; } devpath = alloca(strlen(path) + 5); sprintf(devpath, "%s/dev", path); if (check_path(j, "mount.devfs", devpath, 0, down ? "devfs" : NULL) < 0) return -1; if (down) { *(const char **)&argv[0] = "/sbin/umount"; argv[1] = devpath; argv[2] = NULL; } else { *(const char **)&argv[0] = _PATH_MOUNT; *(const char **)&argv[1] = "-t"; *(const char **)&argv[2] = "devfs"; ruleset = string_param(j->intparams[KP_DEVFS_RULESET]); if (!ruleset) ruleset = "4"; /* devfsrules_jail */ argv[3] = alloca(11 + strlen(ruleset)); sprintf(argv[3], "-oruleset=%s", ruleset); *(const char **)&argv[4] = "."; argv[5] = devpath; argv[6] = NULL; } break; case IP_MOUNT_FDESCFS: argv = alloca(7 * sizeof(char *)); path = string_param(j->intparams[KP_PATH]); if (path == NULL) { jail_warnx(j, "mount.fdescfs: no path"); return -1; } devpath = alloca(strlen(path) + 8); sprintf(devpath, "%s/dev/fd", path); if (check_path(j, "mount.fdescfs", devpath, 0, down ? "fdescfs" : NULL) < 0) return -1; if (down) { *(const char **)&argv[0] = "/sbin/umount"; argv[1] = devpath; argv[2] = NULL; } else { *(const char **)&argv[0] = _PATH_MOUNT; *(const char **)&argv[1] = "-t"; *(const char **)&argv[2] = "fdescfs"; *(const char **)&argv[3] = "."; argv[4] = devpath; argv[5] = NULL; } break; case IP_MOUNT_PROCFS: argv = alloca(7 * sizeof(char *)); path = string_param(j->intparams[KP_PATH]); if (path == NULL) { jail_warnx(j, "mount.procfs: no path"); return -1; } devpath = alloca(strlen(path) + 6); sprintf(devpath, "%s/proc", path); if (check_path(j, "mount.procfs", devpath, 0, down ? "procfs" : NULL) < 0) return -1; if (down) { *(const char **)&argv[0] = "/sbin/umount"; argv[1] = devpath; argv[2] = NULL; } else { *(const char **)&argv[0] = _PATH_MOUNT; *(const char **)&argv[1] = "-t"; *(const char **)&argv[2] = "procfs"; *(const char **)&argv[3] = "."; argv[4] = devpath; argv[5] = NULL; } break; case IP_COMMAND: if (j->name != NULL) goto default_command; argc = 0; TAILQ_FOREACH(s, &j->intparams[IP_COMMAND]->val, tq) argc++; argv = alloca((argc + 1) * sizeof(char *)); argc = 0; TAILQ_FOREACH(s, &j->intparams[IP_COMMAND]->val, tq) argv[argc++] = s->s; argv[argc] = NULL; j->comstring = &dummystring; break; default: default_command: if ((cs = strpbrk(comstring->s, "!\"$&'()*;<>?[\\]`{|}~")) && !(cs[0] == '&' && cs[1] == '\0')) { argv = alloca(4 * sizeof(char *)); *(const char **)&argv[0] = _PATH_BSHELL; *(const char **)&argv[1] = "-c"; argv[2] = comstring->s; argv[3] = NULL; } else { if (cs) { *cs = 0; bg = 1; } comcs = alloca(comstring->len + 1); strcpy(comcs, comstring->s); argc = 0; for (cs = strtok(comcs, " \t\f\v\r\n"); cs; cs = strtok(NULL, " \t\f\v\r\n")) argc++; argv = alloca((argc + 1) * sizeof(char *)); strcpy(comcs, comstring->s); argc = 0; for (cs = strtok(comcs, " \t\f\v\r\n"); cs; cs = strtok(NULL, " \t\f\v\r\n")) argv[argc++] = cs; argv[argc] = NULL; } } if (argv[0] == NULL) return 0; if (int_param(j->intparams[IP_EXEC_TIMEOUT], &timeout) && timeout != 0) { clock_gettime(CLOCK_REALTIME, &j->timeout); j->timeout.tv_sec += timeout; } else j->timeout.tv_sec = 0; injail = comparam == IP_EXEC_START || comparam == IP_COMMAND || comparam == IP_EXEC_STOP; clean = bool_param(j->intparams[IP_EXEC_CLEAN]); username = string_param(j->intparams[injail ? IP_EXEC_JAIL_USER : IP_EXEC_SYSTEM_USER]); sjuser = bool_param(j->intparams[IP_EXEC_SYSTEM_JAIL_USER]); consfd = 0; if (injail && (conslog = string_param(j->intparams[IP_EXEC_CONSOLELOG]))) { if (check_path(j, "exec.consolelog", conslog, 1, NULL) < 0) return -1; consfd = open(conslog, O_WRONLY | O_CREAT | O_APPEND, DEFFILEMODE); if (consfd < 0) { jail_warnx(j, "open %s: %s", conslog, strerror(errno)); return -1; } } comlen = 0; for (i = 0; argv[i]; i++) comlen += strlen(argv[i]) + 1; j->comline = cs = emalloc(comlen); for (i = 0; argv[i]; i++) { strcpy(cs, argv[i]); if (argv[i + 1]) { cs += strlen(argv[i]) + 1; cs[-1] = ' '; } } if (verbose > 0) jail_note(j, "run command%s%s%s: %s\n", injail ? " in jail" : "", username ? " as " : "", username ? username : "", j->comline); pid = fork(); if (pid < 0) err(1, "fork"); if (pid > 0) { if (bg || !add_proc(j, pid)) { free(j->comline); j->comline = NULL; return 0; } else { paralimit--; return 1; } } if (bg) setsid(); /* Set up the environment and run the command */ pwd = NULL; lcap = NULL; if ((clean || username) && injail && sjuser && get_user_info(j, username, &pwd, &lcap) < 0) exit(1); if (injail) { /* jail_attach won't chdir along with its chroot. */ path = string_param(j->intparams[KP_PATH]); if (path && chdir(path) < 0) { jail_warnx(j, "chdir %s: %s", path, strerror(errno)); exit(1); } if (int_param(j->intparams[IP_EXEC_FIB], &fib) && setfib(fib) < 0) { jail_warnx(j, "setfib: %s", strerror(errno)); exit(1); } if (jail_attach(j->jid) < 0) { jail_warnx(j, "jail_attach: %s", strerror(errno)); exit(1); } } if (clean || username) { if (!(injail && sjuser) && get_user_info(j, username, &pwd, &lcap) < 0) exit(1); if (clean) { term = getenv("TERM"); environ = &cleanenv; setenv("PATH", "/bin:/usr/bin", 0); if (term != NULL) setenv("TERM", term, 1); } if (setgid(pwd->pw_gid) < 0) { jail_warnx(j, "setgid %d: %s", pwd->pw_gid, strerror(errno)); exit(1); } if (setusercontext(lcap, pwd, pwd->pw_uid, username ? LOGIN_SETALL & ~LOGIN_SETGROUP & ~LOGIN_SETLOGIN : LOGIN_SETPATH | LOGIN_SETENV) < 0) { jail_warnx(j, "setusercontext %s: %s", pwd->pw_name, strerror(errno)); exit(1); } login_close(lcap); setenv("USER", pwd->pw_name, 1); setenv("HOME", pwd->pw_dir, 1); setenv("SHELL", *pwd->pw_shell ? pwd->pw_shell : _PATH_BSHELL, 1); if (clean && chdir(pwd->pw_dir) < 0) { jail_warnx(j, "chdir %s: %s", pwd->pw_dir, strerror(errno)); exit(1); } endpwent(); } if (consfd != 0 && (dup2(consfd, 1) < 0 || dup2(consfd, 2) < 0)) { jail_warnx(j, "exec.consolelog: %s", strerror(errno)); exit(1); } closefrom(3); execvp(argv[0], argv); jail_warnx(j, "exec %s: %s", argv[0], strerror(errno)); exit(1); } /* * Add a process to the hash, tied to a jail. */ static int add_proc(struct cfjail *j, pid_t pid) { struct kevent ke; struct cfjail *tj; struct phash *ph; 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 (errno == ESRCH) return 0; err(1, "kevent"); } ph = emalloc(sizeof(struct phash)); ph->j = j; ph->pid = pid; LIST_INSERT_HEAD(&phash[pid % PHASH_SIZE], ph, le); j->nprocs++; j->flags |= JF_SLEEPQ; if (j->timeout.tv_sec == 0) requeue(j, &sleeping); else { /* File the jail in the sleep queue according to its timeout. */ TAILQ_REMOVE(j->queue, j, tq); TAILQ_FOREACH(tj, &sleeping, tq) { if (!tj->timeout.tv_sec || j->timeout.tv_sec < tj->timeout.tv_sec || (j->timeout.tv_sec == tj->timeout.tv_sec && j->timeout.tv_nsec <= tj->timeout.tv_nsec)) { TAILQ_INSERT_BEFORE(tj, j, tq); break; } } if (tj == NULL) TAILQ_INSERT_TAIL(&sleeping, j, tq); j->queue = &sleeping; } return 1; } /* * Remove any processes from the hash that correspond to a jail. */ static void clear_procs(struct cfjail *j) { struct kevent ke; struct phash *ph, *tph; int i; j->nprocs = 0; for (i = 0; i < PHASH_SIZE; i++) LIST_FOREACH_SAFE(ph, &phash[i], le, tph) if (ph->j == j) { EV_SET(&ke, ph->pid, EVFILT_PROC, EV_DELETE, NOTE_EXIT, 0, NULL); (void)kevent(kq, &ke, 1, NULL, 0, NULL); LIST_REMOVE(ph, le); free(ph); } } /* * Find the jail that corresponds to an exited process. */ static struct cfjail * find_proc(pid_t pid) { struct cfjail *j; struct phash *ph; LIST_FOREACH(ph, &phash[pid % PHASH_SIZE], le) if (ph->pid == pid) { j = ph->j; LIST_REMOVE(ph, le); free(ph); return --j->nprocs ? NULL : j; } return NULL; } /* * Send SIGTERM to all processes in a jail and wait for them to die. */ static int term_procs(struct cfjail *j) { struct kinfo_proc *ki; int i, noted, pcnt, timeout; static kvm_t *kd; if (!int_param(j->intparams[IP_STOP_TIMEOUT], &timeout)) timeout = DEFAULT_STOP_TIMEOUT; else if (timeout == 0) return 0; if (kd == NULL) { kd = kvm_open(NULL, NULL, NULL, O_RDONLY, NULL); if (kd == NULL) return 0; } ki = kvm_getprocs(kd, KERN_PROC_PROC, 0, &pcnt); if (ki == NULL) return 0; noted = 0; for (i = 0; i < pcnt; i++) if (ki[i].ki_jid == j->jid && kill(ki[i].ki_pid, SIGTERM) == 0) { (void)add_proc(j, ki[i].ki_pid); if (verbose > 0) { if (!noted) { noted = 1; jail_note(j, "sent SIGTERM to:"); } printf(" %d", ki[i].ki_pid); } } if (noted) printf("\n"); if (j->nprocs > 0) { clock_gettime(CLOCK_REALTIME, &j->timeout); j->timeout.tv_sec += timeout; return 1; } return 0; } /* * Look up a user in the passwd and login.conf files. */ static int get_user_info(struct cfjail *j, const char *username, const struct passwd **pwdp, login_cap_t **lcapp) { const struct passwd *pwd; + errno = 0; *pwdp = pwd = username ? getpwnam(username) : getpwuid(getuid()); if (pwd == NULL) { if (errno) jail_warnx(j, "getpwnam%s%s: %s", username ? " " : "", username ? username : "", strerror(errno)); else if (username) jail_warnx(j, "%s: no such user", username); else jail_warnx(j, "unknown uid %d", getuid()); return -1; } *lcapp = login_getpwclass(pwd); if (*lcapp == NULL) { jail_warnx(j, "getpwclass %s: %s", pwd->pw_name, strerror(errno)); return -1; } /* Set the groups while the group file is still available */ if (initgroups(pwd->pw_name, pwd->pw_gid) < 0) { jail_warnx(j, "initgroups %s: %s", pwd->pw_name, strerror(errno)); return -1; } return 0; } /* * Make sure a mount or consolelog path is a valid absolute pathname * with no symlinks. */ static int check_path(struct cfjail *j, const char *pname, const char *path, int isfile, const char *umount_type) { struct stat st, mpst; struct statfs stfs; char *tpath, *p; const char *jailpath; size_t jplen; if (path[0] != '/') { jail_warnx(j, "%s: %s: not an absolute pathname", pname, path); return -1; } /* * Only check for symlinks in components below the jail's path, * since that's where the security risk lies. */ jailpath = string_param(j->intparams[KP_PATH]); if (jailpath == NULL) jailpath = ""; jplen = strlen(jailpath); if (!strncmp(path, jailpath, jplen) && path[jplen] == '/') { tpath = alloca(strlen(path) + 1); strcpy(tpath, path); for (p = tpath + jplen; p != NULL; ) { p = strchr(p + 1, '/'); if (p) *p = '\0'; if (lstat(tpath, &st) < 0) { if (errno == ENOENT && isfile && !p) break; jail_warnx(j, "%s: %s: %s", pname, tpath, strerror(errno)); return -1; } if (S_ISLNK(st.st_mode)) { jail_warnx(j, "%s: %s is a symbolic link", pname, tpath); return -1; } if (p) *p = '/'; } } if (umount_type != NULL) { if (stat(path, &st) < 0 || statfs(path, &stfs) < 0) { jail_warnx(j, "%s: %s: %s", pname, path, strerror(errno)); return -1; } if (stat(stfs.f_mntonname, &mpst) < 0) { jail_warnx(j, "%s: %s: %s", pname, stfs.f_mntonname, strerror(errno)); return -1; } if (st.st_ino != mpst.st_ino) { jail_warnx(j, "%s: %s: not a mount point", pname, path); return -1; } if (strcmp(stfs.f_fstypename, umount_type)) { jail_warnx(j, "%s: %s: not a %s mount", pname, path, umount_type); return -1; } } return 0; } Index: stable/10/usr.sbin/jail/config.c =================================================================== --- stable/10/usr.sbin/jail/config.c (revision 294483) +++ stable/10/usr.sbin/jail/config.c (revision 294484) @@ -1,850 +1,835 @@ /*- * Copyright (c) 2011 James Gritton * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ #include __FBSDID("$FreeBSD$"); #include #include #include #include #include #include #include #include #include #include #include #include #include "jailp.h" struct ipspec { const char *name; unsigned flags; }; extern FILE *yyin; extern int yynerrs; extern int yyparse(void); struct cfjails cfjails = TAILQ_HEAD_INITIALIZER(cfjails); static void free_param(struct cfparams *pp, struct cfparam *p); static void free_param_strings(struct cfparam *p); static const struct ipspec intparams[] = { [IP_ALLOW_DYING] = {"allow.dying", PF_INTERNAL | PF_BOOL}, [IP_COMMAND] = {"command", PF_INTERNAL}, [IP_DEPEND] = {"depend", PF_INTERNAL}, [IP_EXEC_CLEAN] = {"exec.clean", PF_INTERNAL | PF_BOOL}, [IP_EXEC_CONSOLELOG] = {"exec.consolelog", PF_INTERNAL}, [IP_EXEC_FIB] = {"exec.fib", PF_INTERNAL | PF_INT}, [IP_EXEC_JAIL_USER] = {"exec.jail_user", PF_INTERNAL}, [IP_EXEC_POSTSTART] = {"exec.poststart", PF_INTERNAL}, [IP_EXEC_POSTSTOP] = {"exec.poststop", PF_INTERNAL}, [IP_EXEC_PRESTART] = {"exec.prestart", PF_INTERNAL}, [IP_EXEC_PRESTOP] = {"exec.prestop", PF_INTERNAL}, [IP_EXEC_START] = {"exec.start", PF_INTERNAL}, [IP_EXEC_STOP] = {"exec.stop", PF_INTERNAL}, [IP_EXEC_SYSTEM_JAIL_USER]= {"exec.system_jail_user", PF_INTERNAL | PF_BOOL}, [IP_EXEC_SYSTEM_USER] = {"exec.system_user", PF_INTERNAL}, [IP_EXEC_TIMEOUT] = {"exec.timeout", PF_INTERNAL | PF_INT}, #if defined(INET) || defined(INET6) [IP_INTERFACE] = {"interface", PF_INTERNAL}, [IP_IP_HOSTNAME] = {"ip_hostname", PF_INTERNAL | PF_BOOL}, #endif [IP_MOUNT] = {"mount", PF_INTERNAL | PF_REV}, [IP_MOUNT_DEVFS] = {"mount.devfs", PF_INTERNAL | PF_BOOL}, [IP_MOUNT_FDESCFS] = {"mount.fdescfs", PF_INTERNAL | PF_BOOL}, [IP_MOUNT_PROCFS] = {"mount.procfs", PF_INTERNAL | PF_BOOL}, [IP_MOUNT_FSTAB] = {"mount.fstab", PF_INTERNAL}, [IP_STOP_TIMEOUT] = {"stop.timeout", PF_INTERNAL | PF_INT}, [IP_VNET_INTERFACE] = {"vnet.interface", PF_INTERNAL}, #ifdef INET [IP__IP4_IFADDR] = {"ip4.addr", PF_INTERNAL | PF_CONV | PF_REV}, #endif #ifdef INET6 [IP__IP6_IFADDR] = {"ip6.addr", PF_INTERNAL | PF_CONV | PF_REV}, #endif [IP__MOUNT_FROM_FSTAB] = {"mount.fstab", PF_INTERNAL | PF_CONV | PF_REV}, [IP__OP] = {NULL, PF_CONV}, [KP_ALLOW_CHFLAGS] = {"allow.chflags", 0}, [KP_ALLOW_MOUNT] = {"allow.mount", 0}, [KP_ALLOW_RAW_SOCKETS] = {"allow.raw_sockets", 0}, [KP_ALLOW_SET_HOSTNAME]= {"allow.set_hostname", 0}, [KP_ALLOW_SOCKET_AF] = {"allow.socket_af", 0}, [KP_ALLOW_SYSVIPC] = {"allow.sysvipc", 0}, [KP_DEVFS_RULESET] = {"devfs_ruleset", 0}, [KP_ENFORCE_STATFS] = {"enforce_statfs", 0}, [KP_HOST_HOSTNAME] = {"host.hostname", 0}, #ifdef INET [KP_IP4_ADDR] = {"ip4.addr", 0}, #endif #ifdef INET6 [KP_IP6_ADDR] = {"ip6.addr", 0}, #endif [KP_JID] = {"jid", PF_IMMUTABLE}, [KP_NAME] = {"name", PF_IMMUTABLE}, [KP_PATH] = {"path", 0}, [KP_PERSIST] = {"persist", 0}, [KP_SECURELEVEL] = {"securelevel", 0}, [KP_VNET] = {"vnet", 0}, }; /* * Parse the jail configuration file. */ void load_config(void) { struct cfjails wild; struct cfparams opp; struct cfjail *j, *tj, *wj; struct cfparam *p, *vp, *tp; struct cfstring *s, *vs, *ns; struct cfvar *v, *vv; char *ep; int did_self, jseq, pgen; if (!strcmp(cfname, "-")) { cfname = "STDIN"; yyin = stdin; } else { yyin = fopen(cfname, "r"); if (!yyin) err(1, "%s", cfname); } if (yyparse() || yynerrs) exit(1); /* Separate the wildcard jails out from the actual jails. */ jseq = 0; TAILQ_INIT(&wild); TAILQ_FOREACH_SAFE(j, &cfjails, tq, tj) { j->seq = ++jseq; if (wild_jail_name(j->name)) requeue(j, &wild); } TAILQ_FOREACH(j, &cfjails, tq) { /* Set aside the jail's parameters. */ TAILQ_INIT(&opp); TAILQ_CONCAT(&opp, &j->params, tq); /* * The jail name implies its "name" or "jid" parameter, * though they may also be explicitly set later on. */ add_param(j, NULL, strtol(j->name, &ep, 10) && !*ep ? KP_JID : KP_NAME, j->name); /* * Collect parameters for the jail, global parameters/variables, * and any matching wildcard jails. */ did_self = 0; TAILQ_FOREACH(wj, &wild, tq) { if (j->seq < wj->seq && !did_self) { TAILQ_FOREACH(p, &opp, tq) add_param(j, p, 0, NULL); did_self = 1; } if (wild_jail_match(j->name, wj->name)) TAILQ_FOREACH(p, &wj->params, tq) add_param(j, p, 0, NULL); } if (!did_self) TAILQ_FOREACH(p, &opp, tq) add_param(j, p, 0, NULL); /* Resolve any variable substitutions. */ pgen = 0; TAILQ_FOREACH(p, &j->params, tq) { p->gen = ++pgen; find_vars: TAILQ_FOREACH(s, &p->val, tq) { while ((v = STAILQ_FIRST(&s->vars))) { TAILQ_FOREACH(vp, &j->params, tq) if (!strcmp(vp->name, v->name)) break; if (!vp) { jail_warnx(j, "%s: variable \"%s\" not found", p->name, v->name); bad_var: j->flags |= JF_FAILED; TAILQ_FOREACH(vp, &j->params, tq) if (vp->gen == pgen) vp->flags |= PF_BAD; goto free_var; } if (vp->flags & PF_BAD) goto bad_var; if (vp->gen == pgen) { jail_warnx(j, "%s: variable loop", v->name); goto bad_var; } TAILQ_FOREACH(vs, &vp->val, tq) if (!STAILQ_EMPTY(&vs->vars)) { vp->gen = pgen; TAILQ_REMOVE(&j->params, vp, tq); TAILQ_INSERT_BEFORE(p, vp, tq); p = vp; goto find_vars; } vs = TAILQ_FIRST(&vp->val); if (TAILQ_NEXT(vs, tq) != NULL && (s->s[0] != '\0' || STAILQ_NEXT(v, tq))) { jail_warnx(j, "%s: array cannot be " "substituted inline", p->name); goto bad_var; } s->s = erealloc(s->s, s->len + vs->len + 1); memmove(s->s + v->pos + vs->len, s->s + v->pos, s->len - v->pos + 1); memcpy(s->s + v->pos, vs->s, vs->len); vv = v; while ((vv = STAILQ_NEXT(vv, tq))) vv->pos += vs->len; s->len += vs->len; while ((vs = TAILQ_NEXT(vs, tq))) { ns = emalloc(sizeof(struct cfstring)); ns->s = estrdup(vs->s); ns->len = vs->len; STAILQ_INIT(&ns->vars); TAILQ_INSERT_AFTER(&p->val, s, ns, tq); s = ns; } free_var: free(v->name); STAILQ_REMOVE_HEAD(&s->vars, tq); free(v); } } } /* Free the jail's original parameter list and any variables. */ while ((p = TAILQ_FIRST(&opp))) free_param(&opp, p); TAILQ_FOREACH_SAFE(p, &j->params, tq, tp) if (p->flags & PF_VAR) free_param(&j->params, p); } while ((wj = TAILQ_FIRST(&wild))) { free(wj->name); while ((p = TAILQ_FIRST(&wj->params))) free_param(&wj->params, p); TAILQ_REMOVE(&wild, wj, tq); } } /* * Create a new jail record. */ struct cfjail * add_jail(void) { struct cfjail *j; j = emalloc(sizeof(struct cfjail)); memset(j, 0, sizeof(struct cfjail)); TAILQ_INIT(&j->params); STAILQ_INIT(&j->dep[DEP_FROM]); STAILQ_INIT(&j->dep[DEP_TO]); j->queue = &cfjails; TAILQ_INSERT_TAIL(&cfjails, j, tq); return j; } /* * Add a parameter to a jail. */ void add_param(struct cfjail *j, const struct cfparam *p, enum intparam ipnum, const char *value) { struct cfstrings nss; struct cfparam *dp, *np; struct cfstring *s, *ns; struct cfvar *v, *nv; const char *name; char *cs, *tname; unsigned flags; if (j == NULL) { /* Create a single anonymous jail if one doesn't yet exist. */ j = TAILQ_LAST(&cfjails, cfjails); if (j == NULL) j = add_jail(); } TAILQ_INIT(&nss); if (p != NULL) { name = p->name; flags = p->flags; /* * Make a copy of the parameter's string list, * which may be freed if it's overridden later. */ TAILQ_FOREACH(s, &p->val, tq) { ns = emalloc(sizeof(struct cfstring)); ns->s = estrdup(s->s); ns->len = s->len; STAILQ_INIT(&ns->vars); STAILQ_FOREACH(v, &s->vars, tq) { nv = emalloc(sizeof(struct cfvar)); nv->name = strdup(v->name); nv->pos = v->pos; STAILQ_INSERT_TAIL(&ns->vars, nv, tq); } TAILQ_INSERT_TAIL(&nss, ns, tq); } } else { flags = PF_APPEND; if (ipnum != IP__NULL) { name = intparams[ipnum].name; flags |= intparams[ipnum].flags; } else if ((cs = strchr(value, '='))) { tname = alloca(cs - value + 1); strlcpy(tname, value, cs - value + 1); name = tname; value = cs + 1; } else { name = value; value = NULL; } if (value != NULL) { ns = emalloc(sizeof(struct cfstring)); ns->s = estrdup(value); ns->len = strlen(value); STAILQ_INIT(&ns->vars); TAILQ_INSERT_TAIL(&nss, ns, tq); } } /* See if this parameter has already been added. */ if (ipnum != IP__NULL) dp = j->intparams[ipnum]; else TAILQ_FOREACH(dp, &j->params, tq) if (!(dp->flags & PF_CONV) && equalopts(dp->name, name)) break; if (dp != NULL) { /* Found it - append or replace. */ if (dp->flags & PF_IMMUTABLE) { jail_warnx(j, "cannot redefine variable \"%s\".", dp->name); return; } if (strcmp(dp->name, name)) { free(dp->name); dp->name = estrdup(name); } if (!(flags & PF_APPEND) || TAILQ_EMPTY(&nss)) free_param_strings(dp); TAILQ_CONCAT(&dp->val, &nss, tq); dp->flags |= flags; } else { /* Not found - add it. */ np = emalloc(sizeof(struct cfparam)); np->name = estrdup(name); TAILQ_INIT(&np->val); TAILQ_CONCAT(&np->val, &nss, tq); np->flags = flags; np->gen = 0; TAILQ_INSERT_TAIL(&j->params, np, tq); if (ipnum != IP__NULL) j->intparams[ipnum] = np; else for (ipnum = IP__NULL + 1; ipnum < IP_NPARAM; ipnum++) if (!(intparams[ipnum].flags & PF_CONV) && equalopts(name, intparams[ipnum].name)) { j->intparams[ipnum] = np; np->flags |= intparams[ipnum].flags; break; } } } /* * Return if a boolean parameter exists and is true. */ int bool_param(const struct cfparam *p) { const char *cs; if (p == NULL) return 0; cs = strrchr(p->name, '.'); return !strncmp(cs ? cs + 1 : p->name, "no", 2) ^ (TAILQ_EMPTY(&p->val) || !strcasecmp(TAILQ_LAST(&p->val, cfstrings)->s, "true") || (strtol(TAILQ_LAST(&p->val, cfstrings)->s, NULL, 10))); } /* * Set an integer if a parameter if it exists. */ int int_param(const struct cfparam *p, int *ip) { if (p == NULL || TAILQ_EMPTY(&p->val)) return 0; *ip = strtol(TAILQ_LAST(&p->val, cfstrings)->s, NULL, 10); return 1; } /* * Return the string value of a scalar parameter if it exists. */ const char * string_param(const struct cfparam *p) { return (p && !TAILQ_EMPTY(&p->val) ? TAILQ_LAST(&p->val, cfstrings)->s : NULL); } /* * Check syntax and values of internal parameters. Set some internal * parameters based on the values of others. */ int check_intparams(struct cfjail *j) { struct cfparam *p; struct cfstring *s; FILE *f; const char *val; char *cs, *ep, *ln; size_t lnlen; int error; #if defined(INET) || defined(INET6) struct addrinfo hints; struct addrinfo *ai0, *ai; const char *hostname; - int gicode, defif, prefix; + int gicode, defif; #endif #ifdef INET struct in_addr addr4; int ip4ok; char avalue4[INET_ADDRSTRLEN]; #endif #ifdef INET6 struct in6_addr addr6; int ip6ok; char avalue6[INET6_ADDRSTRLEN]; #endif error = 0; /* Check format of boolan and integer values. */ TAILQ_FOREACH(p, &j->params, tq) { if (!TAILQ_EMPTY(&p->val) && (p->flags & (PF_BOOL | PF_INT))) { val = TAILQ_LAST(&p->val, cfstrings)->s; if (p->flags & PF_BOOL) { if (strcasecmp(val, "false") && strcasecmp(val, "true") && ((void)strtol(val, &ep, 10), *ep)) { jail_warnx(j, "%s: unknown boolean value \"%s\"", p->name, val); error = -1; } } else { (void)strtol(val, &ep, 10); if (ep == val || *ep) { jail_warnx(j, "%s: non-integer value \"%s\"", p->name, val); error = -1; } } } } #if defined(INET) || defined(INET6) /* * The ip_hostname parameter looks up the hostname, and adds parameters * for any IP addresses it finds. */ if (((j->flags & JF_OP_MASK) != JF_STOP || j->intparams[IP_INTERFACE] != NULL) && bool_param(j->intparams[IP_IP_HOSTNAME]) && (hostname = string_param(j->intparams[KP_HOST_HOSTNAME]))) { j->intparams[IP_IP_HOSTNAME] = NULL; /* * Silently ignore unsupported address families from * DNS lookups. */ #ifdef INET ip4ok = feature_present("inet"); #endif #ifdef INET6 ip6ok = feature_present("inet6"); #endif if ( #if defined(INET) && defined(INET6) ip4ok || ip6ok #elif defined(INET) ip4ok #elif defined(INET6) ip6ok #endif ) { /* Look up the hostname (or get the address) */ memset(&hints, 0, sizeof(hints)); hints.ai_socktype = SOCK_STREAM; hints.ai_family = #if defined(INET) && defined(INET6) ip4ok ? (ip6ok ? PF_UNSPEC : PF_INET) : PF_INET6; #elif defined(INET) PF_INET; #elif defined(INET6) PF_INET6; #endif gicode = getaddrinfo(hostname, NULL, &hints, &ai0); if (gicode != 0) { jail_warnx(j, "host.hostname %s: %s", hostname, gai_strerror(gicode)); error = -1; } else { /* * Convert the addresses to ASCII so jailparam * can convert them back. Errors are not * expected here. */ for (ai = ai0; ai; ai = ai->ai_next) switch (ai->ai_family) { #ifdef INET case AF_INET: memcpy(&addr4, &((struct sockaddr_in *) (void *)ai->ai_addr)-> sin_addr, sizeof(addr4)); if (inet_ntop(AF_INET, &addr4, avalue4, INET_ADDRSTRLEN) == NULL) err(1, "inet_ntop"); add_param(j, NULL, KP_IP4_ADDR, avalue4); break; #endif #ifdef INET6 case AF_INET6: memcpy(&addr6, &((struct sockaddr_in6 *) (void *)ai->ai_addr)-> sin6_addr, sizeof(addr6)); if (inet_ntop(AF_INET6, &addr6, avalue6, INET6_ADDRSTRLEN) == NULL) err(1, "inet_ntop"); add_param(j, NULL, KP_IP6_ADDR, avalue6); break; #endif } freeaddrinfo(ai0); } } } /* * IP addresses may include an interface to set that address on, * a netmask/suffix for that address and options for ifconfig. * These are copied to an internal command parameter and then stripped * so they won't be passed on to jailparam_set. */ defif = string_param(j->intparams[IP_INTERFACE]) != NULL; #ifdef INET if (j->intparams[KP_IP4_ADDR] != NULL) { TAILQ_FOREACH(s, &j->intparams[KP_IP4_ADDR]->val, tq) { cs = strchr(s->s, '|'); if (cs || defif) add_param(j, NULL, IP__IP4_IFADDR, s->s); if (cs) { strcpy(s->s, cs + 1); s->len -= cs + 1 - s->s; } - if ((cs = strchr(s->s, '/'))) { - prefix = strtol(cs + 1, &ep, 10); - if (*ep == '.' - ? inet_pton(AF_INET, cs + 1, &addr4) != 1 - : *ep || prefix < 0 || prefix > 32) { - jail_warnx(j, - "ip4.addr: bad netmask \"%s\"", cs); - error = -1; - } + if ((cs = strchr(s->s, '/')) != NULL) { *cs = '\0'; s->len = cs - s->s; } if ((cs = strchr(s->s, ' ')) != NULL) { *cs = '\0'; s->len = cs - s->s; } } } #endif #ifdef INET6 if (j->intparams[KP_IP6_ADDR] != NULL) { TAILQ_FOREACH(s, &j->intparams[KP_IP6_ADDR]->val, tq) { cs = strchr(s->s, '|'); if (cs || defif) add_param(j, NULL, IP__IP6_IFADDR, s->s); if (cs) { strcpy(s->s, cs + 1); s->len -= cs + 1 - s->s; } - if ((cs = strchr(s->s, '/'))) { - prefix = strtol(cs + 1, &ep, 10); - if (*ep || prefix < 0 || prefix > 128) { - jail_warnx(j, - "ip6.addr: bad prefixlen \"%s\"", - cs); - error = -1; - } + if ((cs = strchr(s->s, '/')) != NULL) { *cs = '\0'; s->len = cs - s->s; } if ((cs = strchr(s->s, ' ')) != NULL) { *cs = '\0'; s->len = cs - s->s; } } } #endif #endif /* * Read mount.fstab file(s), and treat each line as its own mount * parameter. */ if (j->intparams[IP_MOUNT_FSTAB] != NULL) { TAILQ_FOREACH(s, &j->intparams[IP_MOUNT_FSTAB]->val, tq) { if (s->len == 0) continue; f = fopen(s->s, "r"); if (f == NULL) { jail_warnx(j, "mount.fstab: %s: %s", s->s, strerror(errno)); error = -1; continue; } while ((ln = fgetln(f, &lnlen))) { if ((cs = memchr(ln, '#', lnlen - 1))) lnlen = cs - ln + 1; if (ln[lnlen - 1] == '\n' || ln[lnlen - 1] == '#') ln[lnlen - 1] = '\0'; else { cs = alloca(lnlen + 1); strlcpy(cs, ln, lnlen + 1); ln = cs; } add_param(j, NULL, IP__MOUNT_FROM_FSTAB, ln); } fclose(f); } } if (error) failed(j); return error; } /* * Import parameters into libjail's binary jailparam format. */ int import_params(struct cfjail *j) { struct cfparam *p; struct cfstring *s, *ts; struct jailparam *jp; char *value, *cs; size_t vallen; int error; error = 0; j->njp = 0; TAILQ_FOREACH(p, &j->params, tq) if (!(p->flags & PF_INTERNAL)) j->njp++; j->jp = jp = emalloc(j->njp * sizeof(struct jailparam)); TAILQ_FOREACH(p, &j->params, tq) { if (p->flags & PF_INTERNAL) continue; if (jailparam_init(jp, p->name) < 0) { error = -1; jail_warnx(j, "%s", jail_errmsg); jp++; continue; } if (TAILQ_EMPTY(&p->val)) value = NULL; else if (!jp->jp_elemlen || !TAILQ_NEXT(TAILQ_FIRST(&p->val), tq)) { /* * Scalar parameters silently discard multiple (array) * values, keeping only the last value added. This * lets values added from the command line append to * arrays wthout pre-checking the type. */ value = TAILQ_LAST(&p->val, cfstrings)->s; } else { /* * Convert arrays into comma-separated strings, which * jailparam_import will then convert back into arrays. */ vallen = 0; TAILQ_FOREACH(s, &p->val, tq) vallen += s->len + 1; value = alloca(vallen); cs = value; TAILQ_FOREACH_SAFE(s, &p->val, tq, ts) { memcpy(cs, s->s, s->len); cs += s->len + 1; cs[-1] = ','; } value[vallen - 1] = '\0'; } if (jailparam_import(jp, value) < 0) { error = -1; jail_warnx(j, "%s", jail_errmsg); } jp++; } if (error) { jailparam_free(j->jp, j->njp); free(j->jp); j->jp = NULL; failed(j); } return error; } /* * Check if options are equal (with or without the "no" prefix). */ int equalopts(const char *opt1, const char *opt2) { char *p; /* "opt" vs. "opt" or "noopt" vs. "noopt" */ if (strcmp(opt1, opt2) == 0) return (1); /* "noopt" vs. "opt" */ if (strncmp(opt1, "no", 2) == 0 && strcmp(opt1 + 2, opt2) == 0) return (1); /* "opt" vs. "noopt" */ if (strncmp(opt2, "no", 2) == 0 && strcmp(opt1, opt2 + 2) == 0) return (1); while ((p = strchr(opt1, '.')) != NULL && !strncmp(opt1, opt2, ++p - opt1)) { opt2 += p - opt1; opt1 = p; /* "foo.noopt" vs. "foo.opt" */ if (strncmp(opt1, "no", 2) == 0 && strcmp(opt1 + 2, opt2) == 0) return (1); /* "foo.opt" vs. "foo.noopt" */ if (strncmp(opt2, "no", 2) == 0 && strcmp(opt1, opt2 + 2) == 0) return (1); } return (0); } /* * See if a jail name matches a wildcard. */ int wild_jail_match(const char *jname, const char *wname) { const char *jc, *jd, *wc, *wd; /* * A non-final "*" component in the wild name matches a single jail * component, and a final "*" matches one or more jail components. */ for (jc = jname, wc = wname; (jd = strchr(jc, '.')) && (wd = strchr(wc, '.')); jc = jd + 1, wc = wd + 1) if (strncmp(jc, wc, jd - jc + 1) && strncmp(wc, "*.", 2)) return 0; return (!strcmp(jc, wc) || !strcmp(wc, "*")); } /* * Return if a jail name is a wildcard. */ int wild_jail_name(const char *wname) { const char *wc; for (wc = strchr(wname, '*'); wc; wc = strchr(wc + 1, '*')) if ((wc == wname || wc[-1] == '.') && (wc[1] == '\0' || wc[1] == '.')) return 1; return 0; } /* * Free a parameter record and all its strings and variables. */ static void free_param(struct cfparams *pp, struct cfparam *p) { free(p->name); free_param_strings(p); TAILQ_REMOVE(pp, p, tq); free(p); } static void free_param_strings(struct cfparam *p) { struct cfstring *s; struct cfvar *v; while ((s = TAILQ_FIRST(&p->val))) { free(s->s); while ((v = STAILQ_FIRST(&s->vars))) { free(v->name); STAILQ_REMOVE_HEAD(&s->vars, tq); free(v); } TAILQ_REMOVE(&p->val, s, tq); free(s); } } Index: stable/10 =================================================================== --- stable/10 (revision 294483) +++ stable/10 (revision 294484) Property changes on: stable/10 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r294183,294196