sysctl(9): fix handling string tunables
ClosedPublic
Actions

Authored by kaktus on Apr 15 2020, 10:22 AM.

Details

Reviewers

kib
jhb
np
erj
jeb
emaste
imp

Commits

rS359975: sysctl(9): fix handling string tunables.

Summary

rS357614 changed internals of handling string sysctls, and inadvertently broke setting string tunables. Take them into account.

Reported by: jhb, np
PR: 245463

Test Plan

kenv hw.cxgbe.config_file="kern_tls"
kldload if_cxgbe

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

kaktus created this revision.Apr 15 2020, 10:22 AM

Herald added a subscriber: imp. · View Herald TranscriptApr 15 2020, 10:22 AM

Harbormaster completed remote builds in B30513: Diff 70591.Apr 15 2020, 10:22 AM

kaktus edited the summary of this revision. (Show Details)Apr 15 2020, 10:23 AM

kaktus edited the summary of this revision. (Show Details)Apr 15 2020, 10:48 AM

imp accepted this revision.Apr 15 2020, 2:24 PM

This revision is now accepted and ready to land.Apr 15 2020, 2:24 PM

kib added inline comments.Apr 15 2020, 3:29 PM

sys/kern/kern_sysctl.c
1657 ↗	(On Diff #70591)	While there, fix style. if ((oidp->oid_kind & CTLFLAG_WR) == 0 && (oidp->oid_kind & CTLFLAG_TUN) == 0 In fact I would write this as if ((oidp->oid_kind & (CTLFLAG_WR \| CTLFLAG_TUN)) == 0

kib accepted this revision.Apr 15 2020, 3:30 PM

jhb accepted this revision.Apr 15 2020, 3:56 PM

Closed by commit rS359975: sysctl(9): fix handling string tunables. (authored by kaktus). · Explain WhyApr 15 2020, 4:34 PM

This revision was automatically updated to reflect the committed changes.

kaktus added a commit: rS359975: sysctl(9): fix handling string tunables..

Revision Contents
Changeset List

Path

Size

head/

sys/

kern/

kern_sysctl.c

11 lines

Diff 70607

View Options

head/sys/kern/kern_sysctl.c

	Show First 20 Lines • Show All 4,094 Lines • ▼ Show 20 Lines
	libkern/strtol.c standard			libkern/strtol.c standard
	libkern/strtoq.c standard			libkern/strtoq.c standard
	libkern/strtoul.c standard			libkern/strtoul.c standard
	libkern/strtouq.c standard			libkern/strtouq.c standard
	libkern/strvalid.c standard			libkern/strvalid.c standard
	libkern/timingsafe_bcmp.c standard			libkern/timingsafe_bcmp.c standard
	contrib/zlib/adler32.c optional crypto \| geom_uzip \| \			contrib/zlib/adler32.c optional crypto \| geom_uzip \| \
	mxge \| ddb_ctf \| gzio \| zfs \| zlib \			mxge \| ddb_ctf \| gzio \| zfs \| zlib \
	compile-with "${NORMAL_C} -Wno-deprecated-non-prototype"			compile-with "${ZLIB_C}"
	contrib/zlib/compress.c optional crypto \| geom_uzip \| \			contrib/zlib/compress.c optional crypto \| geom_uzip \| \
	mxge \| ddb_ctf \| gzio \| zfs \| zlib \			mxge \| ddb_ctf \| gzio \| zfs \| zlib \
	compile-with "${NORMAL_C} -Wno-cast-qual -Wno-deprecated-non-prototype"			compile-with "${ZLIB_C}"
	contrib/zlib/crc32.c optional crypto \| geom_uzip \| \			contrib/zlib/crc32.c optional crypto \| geom_uzip \| \
	mxge \| ddb_ctf \| gzio \| zfs \| zlib \			mxge \| ddb_ctf \| gzio \| zfs \| zlib \
	compile-with "${NORMAL_C} ${NO_WSTRICT_PROTOTYPES}"			compile-with "${ZLIB_C}"
	contrib/zlib/deflate.c optional crypto \| geom_uzip \| \			contrib/zlib/deflate.c optional crypto \| geom_uzip \| \
	mxge \| ddb_ctf \| gzio \| zfs \| zlib \			mxge \| ddb_ctf \| gzio \| zfs \| zlib \
	compile-with "${NORMAL_C} -Wno-cast-qual -Wno-deprecated-non-prototype"			compile-with "${ZLIB_C}"
	contrib/zlib/inffast.c optional crypto \| geom_uzip \| \			contrib/zlib/inffast.c optional crypto \| geom_uzip \| \
	mxge \| ddb_ctf \| gzio \| zfs \| zlib \			mxge \| ddb_ctf \| gzio \| zfs \| zlib \
	compile-with "${NORMAL_C} -Wno-deprecated-non-prototype"			compile-with "${ZLIB_C}"
	contrib/zlib/inflate.c optional crypto \| geom_uzip \| \			contrib/zlib/inflate.c optional crypto \| geom_uzip \| \
	mxge \| ddb_ctf \| gzio \| zfs \| zlib \			mxge \| ddb_ctf \| gzio \| zfs \| zlib \
	compile-with "${NORMAL_C} -Wno-deprecated-non-prototype"			compile-with "${ZLIB_C}"
	contrib/zlib/inftrees.c optional crypto \| geom_uzip \| \			contrib/zlib/inftrees.c optional crypto \| geom_uzip \| \
	mxge \| ddb_ctf \| gzio \| zfs \| zlib \			mxge \| ddb_ctf \| gzio \| zfs \| zlib \
	compile-with "${NORMAL_C} -Wno-deprecated-non-prototype"			compile-with "${ZLIB_C}"
	contrib/zlib/trees.c optional crypto \| geom_uzip \| \			contrib/zlib/trees.c optional crypto \| geom_uzip \| \
	mxge \| ddb_ctf \| gzio \| zfs \| zlib \			mxge \| ddb_ctf \| gzio \| zfs \| zlib \
	compile-with "${NORMAL_C} ${NO_WSTRICT_PROTOTYPES}"			compile-with "${ZLIB_C}"
	contrib/zlib/uncompr.c optional crypto \| geom_uzip \| \			contrib/zlib/uncompr.c optional crypto \| geom_uzip \| \
	mxge \| ddb_ctf \| gzio \| zfs \| zlib \			mxge \| ddb_ctf \| gzio \| zfs \| zlib \
	compile-with "${NORMAL_C} -Wno-cast-qual -Wno-deprecated-non-prototype"			compile-with "${ZLIB_C}"
	contrib/zlib/zutil.c optional crypto \| geom_uzip \| \			contrib/zlib/zutil.c optional crypto \| geom_uzip \| \
	mxge \| ddb_ctf \| gzio \| zfs \| zlib \			mxge \| ddb_ctf \| gzio \| zfs \| zlib \
	compile-with "${NORMAL_C} ${NO_WSTRICT_PROTOTYPES}"			compile-with "${ZLIB_C}"
	dev/zlib/zlib_mod.c optional crypto \| geom_uzip \| \			dev/zlib/zlib_mod.c optional crypto \| geom_uzip \| \
	mxge \| ddb_ctf \| gzio \| zfs \| zlib			mxge \| ddb_ctf \| gzio \| zfs \| zlib
	dev/zlib/zcalloc.c optional crypto \| geom_uzip \| \			dev/zlib/zcalloc.c optional crypto \| geom_uzip \| \
	mxge \| ddb_ctf \| gzio \| zfs \| zlib			mxge \| ddb_ctf \| gzio \| zfs \| zlib
	net/altq/altq_cbq.c optional altq			net/altq/altq_cbq.c optional altq
	net/altq/altq_codel.c optional altq			net/altq/altq_codel.c optional altq
	net/altq/altq_hfsc.c optional altq			net/altq/altq_hfsc.c optional altq
	net/altq/altq_fairq.c optional altq			net/altq/altq_fairq.c optional altq
	▲ Show 20 Lines • Show All 1,127 Lines • Show Last 20 Lines

sysctl(9): fix handling string tunablesClosedPublicActions