Page MenuHomeFreeBSD

Escape any '.' characters in sysctl node names
ClosedPublic

Authored by asomers on Jul 21 2021, 9:15 PM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, May 7, 8:54 PM
Unknown Object (File)
Mon, May 6, 12:38 AM
Unknown Object (File)
Thu, May 2, 9:24 PM
Unknown Object (File)
Fri, Apr 26, 3:29 AM
Unknown Object (File)
Fri, Apr 26, 2:56 AM
Unknown Object (File)
Sun, Apr 21, 11:17 AM
Unknown Object (File)
Fri, Apr 19, 10:35 PM
Unknown Object (File)
Mon, Apr 15, 1:51 PM

Details

Summary

ZFS creates some sysctl nodes that include a pool name, and '.' is an
allowed character in pool names. But it's the separator in the sysctl
tree, so it can't be included in a sysctl name. Replace it with "%25".
Handily, "%" is illegal in ZFS pool names, so there's no ambiguity
there.

PR: 257316
MFC after: 3 weeks
Sponsored by: Axcient

Test Plan

manually tested

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

martin_lispworks.com added inline comments.
sys/kern/kern_sysctl.c
771

Is this 1 byte too short (no space for the nul)?

sys/kern/kern_sysctl.c
771

Yep.

  • Allow space for the trailing NUL

Seems reasonable to me.

sys/kern/kern_sysctl.c
765

Accumulating len is unnecessary since it's just i + 1, which you could do once outside of the loop.

This revision is now accepted and ready to land.Jul 22 2021, 3:57 PM