diff options
author | Jamie Gritton <jamie@FreeBSD.org> | 2012-05-11 21:22:52 +0000 |
---|---|---|
committer | Jamie Gritton <jamie@FreeBSD.org> | 2012-05-11 21:22:52 +0000 |
commit | fb8d1d4f19c1a8f9d3874675123fa30d2211a74c (patch) | |
tree | e20f8dbf168e06a29e8ff7a7aad1bb7d3b3f6dfd /lib/libjail | |
parent | 411477c533782e551fcfdce5be614849bd4867ad (diff) | |
download | src-fb8d1d4f19c1a8f9d3874675123fa30d2211a74c.tar.gz src-fb8d1d4f19c1a8f9d3874675123fa30d2211a74c.zip |
The linker isn't consistent in the ordering of dynamic sysctls, so don't
assume that the unnamed final component of "security.jail.param.foo." is
one less than the "foo" component. It might be one greater instead.
Notes
Notes:
svn path=/head/; revision=235291
Diffstat (limited to 'lib/libjail')
-rw-r--r-- | lib/libjail/jail.c | 38 |
1 files changed, 25 insertions, 13 deletions
diff --git a/lib/libjail/jail.c b/lib/libjail/jail.c index af0e40a0dc45..fa39edf1d513 100644 --- a/lib/libjail/jail.c +++ b/lib/libjail/jail.c @@ -855,7 +855,7 @@ jailparam_type(struct jailparam *jp) { char *p, *nname; size_t miblen, desclen; - int isarray; + int i, isarray; struct { int i; char s[MAXPATHLEN]; @@ -977,21 +977,33 @@ jailparam_type(struct jailparam *jp) } break; case CTLTYPE_NODE: - /* A node might be described by an empty-named child. */ + /* + * A node might be described by an empty-named child, + * which would be immediately before or after the node itself. + */ mib[1] = 1; - mib[(miblen / sizeof(int)) + 2] = - mib[(miblen / sizeof(int)) + 1] - 1; miblen += sizeof(int); - desclen = sizeof(desc.s); - if (sysctl(mib, (miblen / sizeof(int)) + 2, desc.s, &desclen, - NULL, 0) < 0) { - snprintf(jail_errmsg, JAIL_ERRMSGLEN, - "sysctl(0.1): %s", strerror(errno)); - return (-1); + for (i = -1; i <= 1; i += 2) { + mib[(miblen / sizeof(int)) + 1] = + mib[(miblen / sizeof(int))] + i; + desclen = sizeof(desc.s); + if (sysctl(mib, (miblen / sizeof(int)) + 2, desc.s, + &desclen, NULL, 0) < 0) { + if (errno == ENOENT) + continue; + snprintf(jail_errmsg, JAIL_ERRMSGLEN, + "sysctl(0.1): %s", strerror(errno)); + return (-1); + } + if (desclen == + sizeof(SJPARAM) + strlen(jp->jp_name) + 2 && + memcmp(SJPARAM ".", desc.s, sizeof(SJPARAM)) == 0 && + memcmp(jp->jp_name, desc.s + sizeof(SJPARAM), + desclen - sizeof(SJPARAM) - 2) == 0 && + desc.s[desclen - 2] == '.') + goto mib_desc; } - if (desc.s[desclen - 2] != '.') - goto unknown_parameter; - goto mib_desc; + goto unknown_parameter; default: snprintf(jail_errmsg, JAIL_ERRMSGLEN, "unknown type for %s", jp->jp_name); |