From nobody Tue Nov 17 17:01:48 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 4jTWH12kLBz71QYf for ; Tue, 17 Nov 2026 17:01:49 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jTWH04xTTz3PlK for ; Tue, 17 Nov 2026 17:01:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794934908; 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=CITp2pFzUF8oBbFDYbTv0tOvBOKbgYkO2Q/qlynA33w=; b=cF122/CwjbB2AX3+lXo0Qs2HL7Dh/uflvAngD3reikeg4T6qyZtFuDV0dy8ZxcRIB3dy/z T/Yxb0mZDQWdP7cdbkvlnFlLIgM4MSAqjp6AN3eSxm1w9DoUQSFBxcLIeWGzZh5UVSbBIi JXY7HefryeTwgkqoz8/Ln799ch71PdjeI+f1f7dk7+sMmKB8XizxKOLhaORNHixzHNbCv6 kpuNf5zCQe/+cgJbjQhj1mZ3lwxTWLs/mXilzqE+NX0MCDtzf5C+v3W9ym617rmuEjfDqu P35Zgn1t1MPpPmdy/BaSzfxQnXeWJOu+MkmCE2sT8Rf4UArEYEjm9PNTp08UIg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794934908; b=LKZI6neHjXP3WyG5xz8P9f99k+O+SqYP2xG1JhG4tk8P2r0tc6U1SF/waG4tlwlIBOpMXk VrbAWN8rZiIiA6rZRl4kvkyjh4N/0/TYmXR2CJJr2Up0e3amOAQ89BhTyLhGtbFOCmAhaZ u6Fhelkxm4h1IMFa5NSCXx4SwLGFqlqRCFBF33esjOx22NF+UkP3H1mo4sJJgM97FztL0a hUo6V3CmRoTAIzljsbN8VmyHvu621ZuLqJqQ8tigkGj8MGyHE2//yV+xkJeymk7OwWh7I7 d04KEsWLSd4fK9TEr5RJxYri7KKE9opp45PklgLarZfz0B4dzoakq89xri2K2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794934908; 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=CITp2pFzUF8oBbFDYbTv0tOvBOKbgYkO2Q/qlynA33w=; b=bhaXWBN+KPWVtrB4pEa9LOeik5BV04sOqnkdt50R4Xsix+mytrVV5s/9XPIsT7djB+QU45 N+Z00zrI/3USZWcmcT80oJEtN2DOGrSHMZ+8nadRznMxUgyEnTBlXoi2NvueFkIxS9Wp8y Z5Q+gQsDp1BFCfWM9vf+5ir8gzndvpynxigL9oIm1F0Zgb6HmMMGPpobbxzkdsTC2INTMY eb+MqRyY49xdfQjWyk4VAgbi+6dymWwD6msKmfAsRadNBy/RLG6/a9Oi1rAD+zth7nJl3d BIv1+FRvo4scqBRg8/HcbB8umI40UbSbbsX3QNr8m4CLFOOYfz4HqwIbJX/Egg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jTWH04bRkzr5x for ; Tue, 17 Nov 2026 17:01:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e512 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:01:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: R. Christian McDonald From: Mark Johnston Subject: git: 45d31a795bdb - main - esp: Fix synchronization of stream cipher counter updates List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository 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: 45d31a795bdb6fbe73b615be2b760915dac3b414 Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:01:48 +0000 Message-Id: <6afc887c.1e512.5120ac43@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=45d31a795bdb6fbe73b615be2b760915dac3b414 commit 45d31a795bdb6fbe73b615be2b760915dac3b414 Author: R. Christian McDonald AuthorDate: 2026-11-12 18:10:09 +0000 Commit: Mark Johnston CommitDate: 2026-11-17 16:57:00 +0000 esp: Fix synchronization of stream cipher counter updates After commit 0361f165f219, the counter embedded in the IV for AES-CTR, AES-GCM and ChaCha20 transforms is incremented under a shared lock, which creates the potential for nonce reuse. This can be abused by an on-path attacker to alter the ciphertext of intercepted packets, and potentially reveal the plaintext of packets whose counter values collide. Approved by: so Security: FreeBSD-SA-26:82.ipsec Security: CVE-2026-101318 Sponsored by: Rubicon Communications, LLC ("Netgate") Fixes: 0361f165f219 ("ipsec: replace SECASVAR mtx by rmlock") --- sys/netipsec/xform_esp.c | 6 ++- tests/sys/netipsec/tunnel/Makefile | 1 + tests/sys/netipsec/tunnel/esp_iv.sh | 91 +++++++++++++++++++++++++++++++++++++ 3 files changed, 97 insertions(+), 1 deletion(-) diff --git a/sys/netipsec/xform_esp.c b/sys/netipsec/xform_esp.c index ff84c6b0a000..1212cfe27132 100644 --- a/sys/netipsec/xform_esp.c +++ b/sys/netipsec/xform_esp.c @@ -841,8 +841,12 @@ esp_output(struct mbuf *m, struct secpolicy *sp, struct secasvar *sav, SECREPLAY_UNLOCK(sav->replay); } cryptoid = sav->tdb_cryptoid; + /* + * The SA lock is shared by every CPU sending on the SA; the IV + * counter must still advance once per packet. + */ if (SAV_ISCTRORGCM(sav) || SAV_ISCHACHA(sav)) - cntr = sav->cntr++; + cntr = atomic_fetchadd_64(&sav->cntr, 1); SECASVAR_RUNLOCK(sav); /* diff --git a/tests/sys/netipsec/tunnel/Makefile b/tests/sys/netipsec/tunnel/Makefile index 0a37711f15c4..ef172547462a 100644 --- a/tests/sys/netipsec/tunnel/Makefile +++ b/tests/sys/netipsec/tunnel/Makefile @@ -12,6 +12,7 @@ ATF_TESTS_SH+= empty \ aesni_aes_gcm_128 \ aesni_aes_gcm_256 \ chacha20_poly1305 \ + esp_iv \ sa_flowid TEST_METADATA+= execenv="jail" \ diff --git a/tests/sys/netipsec/tunnel/esp_iv.sh b/tests/sys/netipsec/tunnel/esp_iv.sh new file mode 100644 index 000000000000..f218113a5c95 --- /dev/null +++ b/tests/sys/netipsec/tunnel/esp_iv.sh @@ -0,0 +1,91 @@ +. $(atf_get_srcdir)/utils.subr + +# The explicit IV of AES-GCM, AES-CTR and ChaCha20-Poly1305 must never repeat +# under one key. esp_output() takes it from a per-SA counter that every CPU +# sending on the SA advances, so drive one tunnel from several processes at +# once, capture the ESP on the wire and look for a repeated IV per SPI. + +atf_test_case "unique" "cleanup" +unique_head() +{ + atf_set descr 'The explicit ESP IV is unique per SA under concurrent senders' + atf_set require.user root + atf_set require.progs tcpdump + atf_set timeout 600 +} + +unique_body() +{ + if [ "$(sysctl -n hw.ncpu)" -lt 2 ]; then + atf_skip "This test needs more than one CPU" + fi + + ist_init + ist_labsetup + ist_v4_setup + ist_setkey ipsecA out 4 aes-gcm-16 "12345678901234567890" + atf_check -s exit:0 -o ignore \ + jexec ipsecA setkey -f ${TMPDIR}/ipsec.ipsecA.conf + ist_setkey ipsecB in 4 aes-gcm-16 "12345678901234567890" + atf_check -s exit:0 -o ignore \ + jexec ipsecB setkey -f ${TMPDIR}/ipsec.ipsecB.conf + atf_check -s exit:0 -o ignore jexec hostA ping -c 1 203.0.113.1 + + # ESP in both directions crosses the router. + jexec router tcpdump -ni ${epair_PUB_A}b -s 64 -w ${TMPDIR}/esp.pcap esp \ + > /dev/null 2>&1 & + tcpdump_pid=$! + sleep 1 + + # Flood pings from the gateway itself, so that each one runs + # esp_output() in its own context on whatever CPU the scheduler gives + # it: many concurrent senders on the same SA each way. (Sent from + # hostA they would all arrive through one epair queue and be + # serialised before they reach IPsec.) + pids="" + for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16; do + jexec ipsecA ping -q -f -c 12000 -S 192.0.2.2 203.0.113.1 \ + > /dev/null 2>&1 & + pids="${pids} $!" + done + wait ${pids} + sleep 1 + kill -INT ${tcpdump_pid} + wait ${tcpdump_pid} 2>/dev/null + + # Per packet: hex of the first 48 bytes after the link header; the ESP + # header follows the IPv4 header, the explicit IV follows the 8-byte + # ESP header. Count a (SPI, IV) pair seen more than once. + tcpdump -nnr ${TMPDIR}/esp.pcap -x esp 2>/dev/null | awk ' + /^[0-9][0-9]:/ { flush(); next } + /^[ \t]*0x00[012]0:/ { line = $0; sub(/^[ \t]*0x00[0-9a-f]+:[ \t]*/, "", line); gsub(/ /, "", line); hex = hex line; next } + function flush() { + if (length(hex) >= 72) { + ihl = strtonum_hex(substr(hex, 2, 1)) * 8; + spi = substr(hex, ihl + 1, 8); iv = substr(hex, ihl + 17, 16); + n++; if (++seen[spi " " iv] == 2) dup++; + } + hex = "" + } + function strtonum_hex(c) { return index("0123456789abcdef", c) - 1 } + END { flush(); printf "%d %d\n", n, dup }' > ${TMPDIR}/esp.count + read packets dups < ${TMPDIR}/esp.count + echo "ESP packets captured: ${packets}, repeated IVs: ${dups}" + + if [ "${packets}" -lt 100000 ]; then + atf_fail "Captured only ${packets} ESP packets" + fi + if [ "${dups}" -ne 0 ]; then + atf_fail "${dups} ESP packets reused an explicit IV" + fi +} + +unique_cleanup() +{ + ist_cleanup +} + +atf_init_test_cases() +{ + atf_add_test_case "unique" +}