Page MenuHomeFreeBSD
Differential D31265

Escape any '.' characters in sysctl node names
ClosedPublic
Actions

Authored by asomers on Jul 21 2021, 9:15 PM.
Tags
None
Referenced Files
F151695378: D31265.id92627.diff
Fri, Apr 10, 2:11 AM
Unknown Object (File)
Tue, Apr 7, 7:19 AM
Unknown Object (File)
Sun, Apr 5, 12:57 PM
Unknown Object (File)
Sun, Apr 5, 10:59 AM
Unknown Object (File)
Sat, Apr 4, 11:01 AM
Unknown Object (File)
Wed, Apr 1, 7:25 PM
Unknown Object (File)
Wed, Apr 1, 8:09 AM
Unknown Object (File)
Tue, Mar 31, 10:02 PM
View All Files
Subscribers
imp
martin_lispworks.com

Details

Reviewers
freqlabs
Commits
rG98c467192082: Escape any '.' characters in sysctl node names
rGe7d99efb3638: Escape any '.' characters in sysctl node names
rG6c9506559080: Escape any '.' characters in sysctl node names
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

asomers created this revision.Jul 21 2021, 9:15 PM
Herald added a subscriber: imp. · View Herald TranscriptJul 21 2021, 9:15 PM
asomers requested review of this revision.Jul 21 2021, 9:15 PM
Harbormaster completed remote builds in B40613: Diff 92608.Jul 21 2021, 9:15 PM
martin_lispworks.com added a subscriber: martin_lispworks.com.Jul 22 2021, 10:17 AM
martin_lispworks.com added inline comments.
sys/kern/kern_sysctl.c
771

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

asomers added inline comments.Jul 22 2021, 12:52 PM
sys/kern/kern_sysctl.c
771

Yep.

asomers updated this revision to Diff 92627.Jul 22 2021, 12:54 PM
  • Allow space for the trailing NUL
Harbormaster completed remote builds in B40622: Diff 92627.Jul 22 2021, 12:54 PM
freqlabs accepted this revision.Jul 22 2021, 3:57 PM

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
Closed by commit rG6c9506559080: Escape any '.' characters in sysctl node names (authored by asomers). · Explain WhyJul 22 2021, 4:24 PM
This revision was automatically updated to reflect the committed changes.
asomers added a commit: rG6c9506559080: Escape any '.' characters in sysctl node names.
asomers added a commit: rGe7d99efb3638: Escape any '.' characters in sysctl node names.Aug 22 2021, 9:23 PM
asomers added a commit: rG98c467192082: Escape any '.' characters in sysctl node names.Aug 22 2021, 11:03 PM

Revision Contents
Changeset List

PathSize
sys/
kern/
48 lines

Diff 92641

View Options

sys/kern/kern_sysctl.c

Loading...