From nobody Tue Nov 10 13:41:44 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 4jP79N5sJtz6ySHF for ; Tue, 10 Nov 2026 13:41:44 +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 4jP79N5K4sz3Llg for ; Tue, 10 Nov 2026 13:41:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794318104; 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=y632zZibVha89w6EpLRJRsd06f/2EYOi0seyFFrqufs=; b=SJADbU0lJkSzQje15JQnJ0z08Wvgkz0Dc+9Z5GQKaNHK/HoADSeSF35DYO4GxtaX2JAHKt yFChFu1u5NeowRPuUMouZ1Z1F+MdzKQOOTot3HHoPvApKV/pxrsnfuGJpNXKcsFIjFZhdO bP688rcvoDc3ckkprDb1ITRVCmtIgkGEG7tqX43eIbXNvmSva9v7q+AenSJOsZwa9KTkQd Q+R7unpsmch9CzyoYgX4pA/pDJSnMYF+92ig1ytUF+LUgDLpLQTpjQs68zHrRwKTWDJAe1 M8UWkswmfakJglz0mJeKbglllK50BnFsEwgxDfAL+rNH8LTTFvXhvfIoPPv2ww== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794318104; b=MYzBpnpnU2vUUWKRarXo9Nv1XswEstBCfGR+zFY3jMj1mpPF5n7/0XEpjfkKKccxsUFEmf 7mqfrpA+JU4GzKHZZmffjPjXvpJ55yAbH4/NPHTWvdC+kE/MgDrYXDpOW65Z0nma2cpTns zTapgf5V+IUrhqXWB3SSqZ+rtqfvAysgVx5tis38kcQR/CZnPI2SrmjNsl5to9my0g8Hd1 vuOADKte3Mbodb2lvFHUnXE68cQ9zKy8Sb0yI1KCHsW3gBks+CbFhCgeMcpwu/4dPXWoEa ZsXL+cfLI247ZdV62sZ0q0Emf4jKIrci6zXNz5CxC8reGtHrBNkMkjeG3inX2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794318104; 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=y632zZibVha89w6EpLRJRsd06f/2EYOi0seyFFrqufs=; b=mmcC4VdHvktxcIDqjklrhkytWMSwfjfVBc+FaM2NkpgjdgmS+ZfsLtB+H6L0YcWhJ9O2DO 9JUMIqYc1i3eHp7JtduNf4rshBJwiDIxxelbwVGzj7K4EJNr7YWCMX1nKENqya0Aq/hGaB oHP6ZC7JAw40ZhbWLpD58f841VntYfcAYG5bKce9ZDGzGy4VX9UIpwJQ/liUxi56kT4DUG i8m0bkd4O8BqCXIZaymrVxWGIDuyZgCY5ZVyzvaNDnjAoYUOyx1DwksMEZxmP6FKy+Dzzm zodrgBL1qUlvlRmMYflOOfX/HeqVNF7F2qOL5fMwzo6G/OLehTwTtgKimE6zxw== 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 4jP79N4j9fzV9M for ; Tue, 10 Nov 2026 13:41:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1b692 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Nov 2026 13:41:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: R. Christian McDonald Subject: git: 5d2e81f29a8a - main - netipsec: Release the SA inside the vnet context in AH and IPComp callbacks 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: rcm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5d2e81f29a8aa5b093cd2343c604466332eca2d4 Auto-Submitted: auto-generated Date: Tue, 10 Nov 2026 13:41:44 +0000 Message-Id: <6af31f18.1b692.f04812@gitrepo.freebsd.org> The branch main has been updated by rcm: URL: https://cgit.FreeBSD.org/src/commit/?id=5d2e81f29a8aa5b093cd2343c604466332eca2d4 commit 5d2e81f29a8aa5b093cd2343c604466332eca2d4 Author: R. Christian McDonald AuthorDate: 2026-11-10 13:40:53 +0000 Commit: R. Christian McDonald CommitDate: 2026-11-10 13:40:53 +0000 netipsec: Release the SA inside the vnet context in AH and IPComp callbacks The error paths of ah_input_cb(), ah_output_cb(), ipcomp_input_cb() and ipcomp_output_cb() called CURVNET_RESTORE() before key_freesav() and key_freesp(). When the callback runs on a crypto return thread, no vnet is set after the restore, and key_freesav() panics with "vnet is not set" on INVARIANTS kernels. Without INVARIANTS, the last reference would be released without a vnet. Restore the vnet last, as the ESP callbacks do. Reviewed by: mjg Fixes: 8a9269edd71a ("ipsec: sprinkle CURVNET_ASSERT_SET") MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D61386 --- sys/netipsec/xform_ah.c | 4 ++-- sys/netipsec/xform_ipcomp.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/netipsec/xform_ah.c b/sys/netipsec/xform_ah.c index 06d3b7923409..7b913bfcce08 100644 --- a/sys/netipsec/xform_ah.c +++ b/sys/netipsec/xform_ah.c @@ -832,7 +832,6 @@ ah_input_cb(struct cryptop *crp) return error; bad: ipsec_sahtree_runlock(&sahtree_tracker); - CURVNET_RESTORE(); if (sav) key_freesav(&sav); if (m != NULL) @@ -841,6 +840,7 @@ bad: free(xd, M_AH); if (crp != NULL) crypto_freereq(crp); + CURVNET_RESTORE(); return error; } @@ -1166,11 +1166,11 @@ ah_output_cb(struct cryptop *crp) CURVNET_RESTORE(); return (error); bad: - CURVNET_RESTORE(); free(xd, M_AH); crypto_freereq(crp); key_freesav(&sav); key_freesp(&sp); + CURVNET_RESTORE(); return (error); } diff --git a/sys/netipsec/xform_ipcomp.c b/sys/netipsec/xform_ipcomp.c index 933be3c57424..f7d4f08ffae9 100644 --- a/sys/netipsec/xform_ipcomp.c +++ b/sys/netipsec/xform_ipcomp.c @@ -392,7 +392,6 @@ ipcomp_input_cb(struct cryptop *crp) return error; bad: ipsec_sahtree_runlock(&sahtree_tracker); - CURVNET_RESTORE(); if (sav != NULL) key_freesav(&sav); if (m != NULL) @@ -401,6 +400,7 @@ bad: free(xd, M_IPCOMP); if (crp != NULL) crypto_freereq(crp); + CURVNET_RESTORE(); return error; } @@ -669,11 +669,11 @@ ipcomp_output_cb(struct cryptop *crp) bad: if (m) m_freem(m); - CURVNET_RESTORE(); free(xd, M_IPCOMP); crypto_freereq(crp); key_freesav(&sav); key_freesp(&sp); + CURVNET_RESTORE(); return (error); }