d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sbin/sysctl: Fix CTLFLAG_SKIP for adjacent nodes

Browse Source 
The OID is saved when we encounter CTLFLAG_SKIP so that descendants can
be skipped as well. We then must not update the skip OID until we are
out of the node. This was achieved by resetting the skip OID once the
prefix no longer matches, but the case where the OID we reset on has
CTLFLAG_SKIP was not accounted for.

Reported by:	mav
Reviewed by:	mav
Sponsored by:	iXsystems, Inc.
Differential Revision:	https://reviews.freebsd.org/D28364

(cherry picked from commit 65efb73fbd)
This commit is contained in:
Ryan Moeller 2021-01-27 14:27:46 -05:00
parent 40cb0344eb
commit 5d58f58b0d
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sbin/sysctl/sysctl.c
View File

@ -1030,7 +1030,8 @@ show_var(int *oid, int nlen, bool honor_skip)
}
/* keep track of encountered skip nodes, ignoring descendants */
if (skip_len == 0 && (kind & CTLFLAG_SKIP) != 0) {
if ((skip_len == 0 || skip_len >= nlen * (int)sizeof(int)) &&
(kind & CTLFLAG_SKIP) != 0) {
/* Save this oid so we can skip descendants. */
skip_len = nlen * sizeof(int);
memcpy(skip_oid, oid, skip_len);