From nobody Fri Jan 31 15:22:41 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yl04x2RzTz5mKYG; Fri, 31 Jan 2025 15:22:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yl04x1pFxz3cZK; Fri, 31 Jan 2025 15:22:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738336961; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JoJZM4UN4IOTaEEzYiveSYJrBUOHhDMCqDEVjhE62xI=; b=euydm0D3IfjdnJGZ/Yu8RIQBGEtGR12L+ByfLQM7uy0vVMaztERQkj8E/qw7d264JbiNzX sfrf421o5HE/5CFYFLTXpX/kSIlm7f4AuLJu2efoi9or2H9LN2AbqKufFdgcX129+UrPgu BfJEcxUtiI7OFvustrvvPi5BZvGREA2Ugcj2XWLteC/cMumzOhK2YRznne0qMZyXDopIiH Heu5qL98yJwcklpyV3NNnOsmwY0Gnpmyhy0lx6suN8n5IlxUpgtdNm6Hlg5fAF7qaJUjKq EGc2NTkHyTcTGGi+4Af13zKc8mlp7HnJKtEViCTxYBAS9sHZKsRllLvwlBdU3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738336961; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JoJZM4UN4IOTaEEzYiveSYJrBUOHhDMCqDEVjhE62xI=; b=hhBjisdZkNm/lx6ePRz03C1CnmU0hxA2zsqcVsN8G2aNdqcBCneZJBjMp0g5+RCjwwoPA1 tHofqKlefwT+5FslH1s3dIBxOTtBThResLkaQ9ykeppbgh+fhvFhMEt7PzQhLEf7gfEklQ 1z2xhCTOtLs67hP3bGv+e3w3FnM+qK/k5nNQJTxxdkl3iMJcJN6eOYrgiAP67eickEd3vo Y7LlUdMBIqLW7egSDGLZ5oAe2a506raHY78LQrES3YG6sj54jkS1WVjSQCdN4WAC0ftE22 5QIh2sGGqQg817+VhEcRs7ExiP8QVQI8crM7OTe94W+W/c9Ya3ilTuwcG0ZUKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738336961; a=rsa-sha256; cv=none; b=jD5NbnU2/8YsbTSIdxDx5cZzSBUuzeSvWBNj59o1vE4QZWZVPh+sVmjVlcdh4aY6Y8XLuT HJCpyQ9Ip6U0z/xxmVVmgyWXcgKZcy492YkdzoOYfoYBt46IkMicrhu0VNq15FDOtsFCuX 0f1kkYNDWS2lL+1TCCZz8Ylv/GjoEhk2tKULZLJtjkkLaAjWarGw2+7dyqCmifBP30Vmvc Apj8oyGmj+thMYq/Oq2a9atbvaBsqU7cENMycyMBLTmrI+P7BOp7N+V8wyqAZQnd4WIQWv hDN3MZUkt5A0MIGv8dz/fiBqANs7xw0XOUXSxdP/qMYdKfCQz2D2TuQ30xA7Gw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yl04x1M0pz81s; Fri, 31 Jan 2025 15:22:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50VFMfwc062323; Fri, 31 Jan 2025 15:22:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50VFMfQi062320; Fri, 31 Jan 2025 15:22:41 GMT (envelope-from git) Date: Fri, 31 Jan 2025 15:22:41 GMT Message-Id: <202501311522.50VFMfQi062320@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: afc38f1f23ac - main - sysctl: Add a regression test which runs sysctl -a List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: afc38f1f23ac3b579144d0d1d0c3fadf735d57bd Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=afc38f1f23ac3b579144d0d1d0c3fadf735d57bd commit afc38f1f23ac3b579144d0d1d0c3fadf735d57bd Author: Mark Johnston AuthorDate: 2025-01-31 15:20:04 +0000 Commit: Mark Johnston CommitDate: 2025-01-31 15:22:24 +0000 sysctl: Add a regression test which runs sysctl -a Run sysctl -a during the test suite so that KASAN/KMSAN have a chance to catch something. Inspired by https://jprx.io/cve-2024-54507/ Reviewed by: jhb, emaste MFC after: 2 weeks Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D48659 --- sbin/sysctl/tests/sysctl_test.sh | 57 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/sbin/sysctl/tests/sysctl_test.sh b/sbin/sysctl/tests/sysctl_test.sh index e932626a9f14..dfc32a87b212 100644 --- a/sbin/sysctl/tests/sysctl_test.sh +++ b/sbin/sysctl/tests/sysctl_test.sh @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: BSD-2-Clause +# # Copyright (c) 2022 Yoshihiro Ota # # Redistribution and use in source and binary forms, with or without @@ -20,12 +23,64 @@ # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. +# sysctl_name="kern.ostype" sysctl_value="FreeBSD" sysctl_type="string" sysctl_description="Operating system type" +atf_test_case sysctl_aflag +sysctl_aflag_head() +{ + atf_set "descr" "Exercise all sysctl handlers" +} +sysctl_aflag_body() +{ + # Avoid using atf_check here since sysctl -ao generates tons of + # output and it would all otherwise be saved. + sysctl -ao >/dev/null 2>stderr + if [ $? -ne 0 ]; then + atf_fail "sysctl -ao failed" + elif [ -s stderr ]; then + cat stderr + atf_fail "sysctl -ao printed to stderr" + fi +} + + +atf_test_case sysctl_aflag_jail +sysctl_aflag_jail_head() +{ + atf_set "descr" "Exercise all sysctl handlers in a jail" + atf_set "require.user" "root" +} +sysctl_aflag_jail_body() +{ + local jail + + jail=sysctl_test_aflag_jail + + # Avoid using atf_check here since sysctl -ao generates tons of + # output and it would all otherwise be saved. + jail -c name=$jail command=sysctl -ao >/dev/null 2>stderr + if [ $? -ne 0 ]; then + atf_fail "sysctl -ao failed" + elif [ -s stderr ]; then + cat stderr + atf_fail "sysctl -ao printed to stderr" + fi + + jail -c name=$jail vnet command=sysctl -ao >/dev/null 2>stderr + if [ $? -ne 0 ]; then + atf_fail "sysctl -ao failed" + elif [ -s stderr ]; then + cat stderr + atf_fail "sysctl -ao printed to stderr" + fi +} + + atf_test_case sysctl_by_name sysctl_by_name_head() { @@ -106,6 +161,8 @@ sysctl_nflag_tflag_dflag_body() atf_init_test_cases() { + atf_add_test_case sysctl_aflag + atf_add_test_case sysctl_aflag_jail atf_add_test_case sysctl_by_name atf_add_test_case sysctl_nflag atf_add_test_case sysctl_eflag