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

register_oid: fix duplicate oid after d3f96f6610

Browse Source 
sysctl_register_oid must check the uniqueness of any newly computed
oid_number in sysctl_register_oid.

Reviewed by:	asomers
MFC with:	d3f96f6610
Differential Revision:	https://reviews.freebsd.org/D36743
This commit is contained in:
Doug Moore 2022-09-27 12:13:50 -05:00
parent c075ea46bc
commit ed5183455e
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/kern/kern_sysctl.c
View File

@ -479,10 +479,9 @@ sysctl_register_oid(struct sysctl_oid *oidp)
/*
* Insert the OID into the parent's list sorted by OID number.
*/
retry:
key.oid_number = oid_number;
p = RB_FIND(sysctl_oid_list, parent, &key);
if (p) {
p = RB_NFIND(sysctl_oid_list, parent, &key);
while (p != NULL && oid_number == p->oid_number) {
/* get the next valid OID number */
if (oid_number < CTL_AUTO_START ||
oid_number == 0x7fffffff) {
@ -491,10 +490,12 @@ sysctl_register_oid(struct sysctl_oid *oidp)
/* don't loop forever */
if (!timeout--)
panic("sysctl: Out of OID numbers\n");
goto retry;
} else {
oid_number++;
key.oid_number = oid_number;
p = RB_NFIND(sysctl_oid_list, parent, &key);
continue;
}
p = RB_NEXT(sysctl_oid_list, NULL, p);
oid_number++;
}
/* check for non-auto OID number collision */
if (oidp->oid_number >= 0 && oidp->oid_number < CTL_AUTO_START &&