From nobody Wed Jul 29 17:47:56 2026 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 4h9KYT3T35z6mZKm for ; Wed, 29 Jul 2026 17:47:57 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h9KYT23x9z3g7p for ; Wed, 29 Jul 2026 17:47:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785347277; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nAQ3OnJ9lh8KaYJqzTZslZ+orgFZXJU/iFKOL5LiYnA=; b=GTf7+rg52aYoz/NkGfonRySmEX3jKkQMiBu2qNOssDV/7jtLAEUhYt+bqiipo8PaUsyrqh Sr9rwIzn8MmIZcUdtBJFNHWLmxCSRIEOFdJpKFINwMyhUoxybGwq1qxRZb6Bsy5s2mw37B vdna0qCWP49g7iBYyXRs5sq2Y8qPJkqH/WnRCfRAlL20i72Jo2PyKrwpdThg3fc1SKggh8 KzKMKADv/G/n9meR1sEynhMndUWqjh5vLth6HmeKNSxh0h91P5hqmgKPK97R7SDRncrIaQ 1flHh4fKL9/iWMWLwGJyTroYQQeQ5+APMO9IgUnpxW/jEbwURcrued9uCwQTrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785347277; a=rsa-sha256; cv=none; b=xlRviGDttF2X8DP/fhf0gkfAu535CqLezWs/BaICp0MjCu8bGoHBMS9f8WJ/koN59StPr0 pheho93Hvci5i5ZWkmd7COuvmTZqWRcCvSzhfO3ZzIyQmTZDVlpWik+eJftzghMl14SeGx UtxnSC+wdR/HRsDasC5HBV/cmyoa21SBBANCJFqVoWTZ1wPKvmy5R/KU9E/nGlecd2mPQJ rrBuCizxrAR9uiIBCGI3bdGk/HAFCXoGtWUu2Pk6GB6MCRlJWqLoKjQEV1pm3FMnLxM9Ix JkmkPu0HCXwrOyONVpu/HfRs1PtvJ9Ht7GGYO5wg636SwsCit96PaPg5cgEUeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785347277; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nAQ3OnJ9lh8KaYJqzTZslZ+orgFZXJU/iFKOL5LiYnA=; b=KIqCzJf5UT8PjWlvZahcCTYfmPNpIG3pzxyjZ1xm9S/u0ilV004JDPkiv7IubZeXvwZJX3 uOq2asIEKanc05oSPngOaMq6Tdv98gp6A7Dkq9ieYbyxSrEZ0tMaf8ePNx47BLGCzj2pzq 9qYISVW7yfoj5CrfvAEx95aVru9gaLr0W+LTsbMFc8kPPJN/UGsG3m90c9AxpcJJrM5vG9 XXz7fu4CXIZMXk3S/6jflKpPhAGpu0peUQ4zIOuOoa82njh0fsvL6x0afiAx8wl8xJlIDm PaqJMt7Pew9H5oyuSctpJrT7HtKNpC591I2RFmkTY1l1uTxDEBN9TY907VGLvA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h9KYS6GTmzd9H for ; Wed, 29 Jul 2026 17:47:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3aae8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 29 Jul 2026 17:47:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: John Baldwin From: Mark Johnston Subject: git: db3afbe5a6ef - main - wg(4): Add a test that the driver handles a decryption failure 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: db3afbe5a6efce56fb30dd117de54d3dd6a61f37 Auto-Submitted: auto-generated Date: Wed, 29 Jul 2026 17:47:56 +0000 Message-Id: <6a6a3ccc.3aae8.3e3fd082@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=db3afbe5a6efce56fb30dd117de54d3dd6a61f37 commit db3afbe5a6efce56fb30dd117de54d3dd6a61f37 Author: John Baldwin AuthorDate: 2026-07-27 15:37:43 +0000 Commit: Mark Johnston CommitDate: 2026-07-29 17:45:02 +0000 wg(4): Add a test that the driver handles a decryption failure The test uses a fail point to inject a decryption error in OCF while sending a ping across the tunnel. The driver should then fail to respond to the ping and increment the input error counter on the interface. Approved by: so Security: FreeBSD-SA-26:52.if_wg Security: CVE-2026-58085 Reviewed by: markj Sponsored by: Chelsio Communications --- etc/mtree/BSD.tests.dist | 2 + tests/sys/net/Makefile | 1 + tests/sys/net/wg/Makefile | 10 ++++ tests/sys/net/wg/if_wg_nojail.sh | 111 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 124 insertions(+) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index dec5bf53ebeb..45bb843760ba 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -906,6 +906,8 @@ .. routing .. + wg + .. .. netgraph .. diff --git a/tests/sys/net/Makefile b/tests/sys/net/Makefile index b1bd2c06f729..394fbea12dcd 100644 --- a/tests/sys/net/Makefile +++ b/tests/sys/net/Makefile @@ -19,6 +19,7 @@ TEST_METADATA+= execenv_jail_params="vnet allow.raw_sockets" TESTS_SUBDIRS+= bpf TESTS_SUBDIRS+= if_ovpn +TESTS_SUBDIRS+= wg TESTS_SUBDIRS+= routing # The netmap bridge application is used by if_wg tests. diff --git a/tests/sys/net/wg/Makefile b/tests/sys/net/wg/Makefile new file mode 100644 index 000000000000..7b6ec201605f --- /dev/null +++ b/tests/sys/net/wg/Makefile @@ -0,0 +1,10 @@ +PACKAGE= tests + +TESTSDIR= ${TESTSBASE}/sys/net/wg +BINDIR= ${TESTSDIR} + +ATF_TESTS_SH+= if_wg_nojail + +TEST_METADATA.if_wg_nojail= is_exclusive=true + +.include diff --git a/tests/sys/net/wg/if_wg_nojail.sh b/tests/sys/net/wg/if_wg_nojail.sh new file mode 100644 index 000000000000..0587b992622a --- /dev/null +++ b/tests/sys/net/wg/if_wg_nojail.sh @@ -0,0 +1,111 @@ +# +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2021 The FreeBSD Foundation +# +# This software was developed by Mark Johnston under sponsorship +# from the FreeBSD Foundation. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# 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. + +. $(atf_get_srcdir)/../../common/vnet.subr + +atf_test_case "wg_bad_decrypt" "cleanup" +wg_bad_decrypt_head() +{ + atf_set descr 'Create a wg(4) tunnel over an epair and inject a decryption error' + atf_set require.user root + atf_set require.kmods if_wg +} + +wg_bad_decrypt_body() +{ + local epair pri1 pri2 pub1 pub2 wg1 wg2 + local endpoint1 endpoint2 tunnel1 tunnel2 + + pri1=$(wg genkey) + pri2=$(wg genkey) + + endpoint1=192.168.2.1 + endpoint2=192.168.2.2 + tunnel1=169.254.0.1 + tunnel2=169.254.0.2 + + epair=$(vnet_mkepair) + + vnet_init + + vnet_mkjail wgtest1 ${epair}a + vnet_mkjail wgtest2 ${epair}b + + jexec wgtest1 ifconfig ${epair}a ${endpoint1}/24 up + jexec wgtest2 ifconfig ${epair}b ${endpoint2}/24 up + + wg1=$(jexec wgtest1 ifconfig wg create) + echo "$pri1" | jexec wgtest1 wg set $wg1 listen-port 12345 \ + private-key /dev/stdin + pub1=$(jexec wgtest1 wg show $wg1 public-key) + wg2=$(jexec wgtest2 ifconfig wg create) + echo "$pri2" | jexec wgtest2 wg set $wg2 listen-port 12345 \ + private-key /dev/stdin + pub2=$(jexec wgtest2 wg show $wg2 public-key) + + atf_check -s exit:0 -o ignore \ + jexec wgtest1 wg set $wg1 peer "$pub2" \ + endpoint ${endpoint2}:12345 allowed-ips ${tunnel2}/32 + atf_check -s exit:0 \ + jexec wgtest1 ifconfig $wg1 inet ${tunnel1}/24 up + + atf_check -s exit:0 -o ignore \ + jexec wgtest2 wg set $wg2 peer "$pub1" \ + endpoint ${endpoint1}:12345 allowed-ips ${tunnel1}/32 + atf_check -s exit:0 \ + jexec wgtest2 ifconfig $wg2 inet ${tunnel2}/24 up + + # Generous timeout since the handshake takes some time. + atf_check -s exit:0 -o ignore jexec wgtest1 ping -c 1 -t 5 $tunnel2 + + # No receive errors before injection + ierrs=$(netstat -j wgtest2 -I $wg2 --libxo json,pretty | \ + awk '/received-errors/ { print $2 }') + atf_check_equal "0," "$ierrs" + + # Trigger a decryption error + atf_check -s exit:0 -o ignore \ + sysctl debug.fail_point.crypto.inject_badmsg="1*return" + + atf_check -s exit:2 -o ignore jexec wgtest1 ping -c 1 -t 5 $tunnel2 + + ierrs=$(netstat -j wgtest2 -I $wg2 --libxo json,pretty | \ + awk '/received-errors/ { print $2 }') + atf_check_equal "1," "$ierrs" +} + +wg_bad_decrypt_cleanup() +{ + vnet_cleanup +} + +atf_init_test_cases() +{ + atf_add_test_case "wg_bad_decrypt" +}