diff options
| author | jamie <jamie@FreeBSD.org> | 2013-03-28 21:02:49 +0000 |
|---|---|---|
| committer | jamie <jamie@FreeBSD.org> | 2013-03-28 21:02:49 +0000 |
| commit | 82d58114889a20fcd15b9f51da2e60600642ed77 (patch) | |
| tree | a7ea5132957188b191c1034669ee8f49822084d2 /usr.sbin/jail/command.c | |
| parent | 2380294328e0c3c80c578a4b4889748084c237ac (diff) | |
| download | FreeBSD-src-82d58114889a20fcd15b9f51da2e60600642ed77.zip FreeBSD-src-82d58114889a20fcd15b9f51da2e60600642ed77.tar.gz | |
Reverse the order of some implicit commands (FS mounts and ifconfigs)
when stopping jails. This matters particularly for nested filesystem
mounts.
PR: kern/177325
Submitted by: Harald Schmalzbauer
MFC after: 3 days
Diffstat (limited to 'usr.sbin/jail/command.c')
| -rw-r--r-- | usr.sbin/jail/command.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/usr.sbin/jail/command.c b/usr.sbin/jail/command.c index 3bdedad..452a079 100644 --- a/usr.sbin/jail/command.c +++ b/usr.sbin/jail/command.c @@ -88,13 +88,14 @@ int next_command(struct cfjail *j) { enum intparam comparam; - int create_failed; + 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) { @@ -113,14 +114,16 @@ next_command(struct cfjail *j) default: if (j->intparams[comparam] == NULL) continue; - j->comstring = create_failed + 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 + create_failed || (stopping && + (j->intparams[comparam]->flags & PF_REV)) ? TAILQ_PREV(j->comstring, cfstrings, tq) : TAILQ_NEXT(j->comstring, tq); } |
