Fix libjail reached latest sysctl entry
ClosedPublic
Actions

Authored by br on Sep 30 2016, 3:14 PM.

Details

Reviewers

jamie
bz

Commits

rS306580: Fix libjail reached latest sysctl entry.

Summary

on MIPS sysctl entries appears in different order for some reason.
There is no more entries after we get all the "security.jail.param" subentries
So finish successfully once this happen.

Diff Detail

Lint

Lint Skipped

Unit

Tests Skipped

Event Timeline

br updated this revision to Diff 20869.Sep 30 2016, 3:14 PM

br retitled this revision from to Fix libjail reached latest sysctl entry.

br updated this object.

br edited the test plan for this revision. (Show Details)

br added reviewers: jamie, bz.

Surely those blackslashes at the ends of the lines shouldn't be there?

remove backslashes

In D8096#167754, @jamie wrote:

Surely those blackslashes at the ends of the lines shouldn't be there?

ok, looks better without

Sorry I got sidetracked by that bit, and that it was the only thing I had to say at the time - I just wasn't available to follow up today. Yeah, the actual substantial part of the change looks good.

This revision is now accepted and ready to land.Oct 2 2016, 4:21 AM

Closed by commit rS306580: Fix libjail reached latest sysctl entry. (authored by br). · Explain WhyOct 2 2016, 11:56 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Path

Size

lib/

libjail/

jail.c

7 lines

Diff 20904

View Options

lib/libjail/jail.c

Show First 20 Lines • Show All 217 Lines • ▼ Show 20 Lines	if (sysctlnametomib(SJPARAM, mib1 + 2, &mlen1) < 0) {
snprintf(jail_errmsg, JAIL_ERRMSGLEN,		snprintf(jail_errmsg, JAIL_ERRMSGLEN,
"sysctlnametomib(" SJPARAM "): %s", strerror(errno));		"sysctlnametomib(" SJPARAM "): %s", strerror(errno));
goto error;		goto error;
}		}
for (;; njp++) {		for (;; njp++) {
/* Get the next parameter. */		/* Get the next parameter. */
mlen2 = sizeof(mib2);		mlen2 = sizeof(mib2);
if (sysctl(mib1, mlen1 + 2, mib2, &mlen2, NULL, 0) < 0) {		if (sysctl(mib1, mlen1 + 2, mib2, &mlen2, NULL, 0) < 0) {
		if (errno == ENOENT) {
		/* No more entries. */
		break;
		}
snprintf(jail_errmsg, JAIL_ERRMSGLEN,		snprintf(jail_errmsg, JAIL_ERRMSGLEN,
"sysctl(0.2): %s", strerror(errno));		"sysctl(0.2): %s", strerror(errno));
goto error;		goto error;
}		}
if (mib2[0] != mib1[2] \|\| mib2[1] != mib1[3] \|\|		if (mib2[0] != mib1[2] \|\|
		mib2[1] != mib1[3] \|\|
mib2[2] != mib1[4])		mib2[2] != mib1[4])
break;		break;
/* Convert it to an ascii name. */		/* Convert it to an ascii name. */
memcpy(mib1 + 2, mib2, mlen2);		memcpy(mib1 + 2, mib2, mlen2);
mlen1 = mlen2 / sizeof(int);		mlen1 = mlen2 / sizeof(int);
mib1[1] = 1;		mib1[1] = 1;
buflen = sizeof(buf);		buflen = sizeof(buf);
if (sysctl(mib1, mlen1 + 2, buf, &buflen, NULL, 0) < 0) {		if (sysctl(mib1, mlen1 + 2, buf, &buflen, NULL, 0) < 0) {
▲ Show 20 Lines • Show All 831 Lines • Show Last 20 Lines

Fix libjail reached latest sysctl entryClosedPublicActions