Page MenuHomeFreeBSD

Escape any '.' characters in sysctl node names
ClosedPublic

Authored by asomers on Wed, Jul 21, 9:15 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
R10 FreeBSD src repository
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

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

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

sys/kern/kern_sysctl.c
770

Yep.

  • Allow space for the trailing NUL

Seems reasonable to me.

sys/kern/kern_sysctl.c
764

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.Thu, Jul 22, 3:57 PM