The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=db3afbe5a6efce56fb30dd117de54d3dd6a61f37
commit db3afbe5a6efce56fb30dd117de54d3dd6a61f37 Author: John Baldwin <[email protected]> AuthorDate: 2026-07-27 15:37:43 +0000 Commit: Mark Johnston <[email protected]> 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 <bsd.test.mk> 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" +}
