From nobody Mon Aug 10 13:23:08 2026 X-Original-To: dev-commits-src-main@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 4hJb6T5gFYz6nmZp for ; Mon, 10 Aug 2026 13:23:13 +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 4hJb6T4WsRz3LQD for ; Mon, 10 Aug 2026 13:23:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786368193; 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=i4OFTtqA5wK1g5lk+dDsaGfu3licJF2NWb47dsbkr0U=; b=BbICLemcA6UzaP/i6KWWvrX2fNaFK1rt51eSzpL3kQCzCT1cDflKF2Z3kFbjz67gB+l6rN 0hUtRt/2xrh/OnN2VVTs+Bk+Lp6ZoKPsD8581Qw/Ub4kgAI3RZVxLXGlFG3tc0DI4NwTDO VSiWcTr0TBJl9DJcaFMo+qFxnOGVW/4FLMH0HW70U3vOg2cqgUIbLPDj3sciKwtXvsZz2S IEVmtS791/5Sx6QcVRS0Nfe5XYnhfdckLuULoJe/nGnRjc36zQjMUdoJVZX1v2BKdSFzoQ B4qKofDjCj7/tu8bkzKk2UUb35EEdNlsKEEj8DbNShAMyr8uEM6zQ93/BbalNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786368193; a=rsa-sha256; cv=none; b=yWgOP1hE6qqTmY/OZTXJaQ1ygQZiBfddyN7D4swXpItbrioLYcZ3fXrymgS5UoSd7aySj0 mDXUmnXEl7EonD+EJv4oY0m2X9wC2gWTt7bUs3fF1VKWyMNtwyXuPn0RNg78YX5jS/tYgh MTgKAaVxw4ASCVAEaMtiBsCZkmxinCsdhtSl2zver/NUZngZJfSuY9HYdOPVkIV6cWrAP+ aX4XukB+a0LnpTGEaLQCh0YfQg/fpDXs7jXxBIeYRdZ4wn+89Ed9LR63vJjIRcJclDV+SD XUKqdZ8mYJAx4G9K62c6LYtkGr8ZBGgITcn6l8ssOd/90skEAWhWztQxHqs6Eg== 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=1786368193; 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=i4OFTtqA5wK1g5lk+dDsaGfu3licJF2NWb47dsbkr0U=; b=TZmJ7q61S97PzSbsVcsvUpZtJubqNkHdKt/OfJCRNzLfCz06GLAcw3qowF0X7z0gCCnGl9 qx1Zdl8kF7iKJo8q134HbBTC7KMmQudmwKHnzBd4Dd64QMH+16VCGe0Bz3rKh9dONkIpCB C3pgUkD+UtfSF9Y4iaJ318jjN5ik10eLCPMwkDr4WycG1p4nOrXdMs/mAv1RPbiPNRKuEe bkFopAGQFFLFsx9Za/16zO90tjJt7Y5uNpPHJrHcb99n67oKx6IIjDy3LSLwZyjadTOdEY BnTD561oQ03MOoo5PysGa/nlGA1nJSDrin1y68cpc+fKmyZrXEZG/Kvr3wuSog== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hJb6T2knxz19Ph for ; Mon, 10 Aug 2026 13:23:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18a5f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 10 Aug 2026 13:23:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: LuisCastellanos-dev From: Kristof Provost Subject: git: a841961da752 - main - if_ovpn: free crp, mbuf, and release refcount on crypto_dispatch() failure List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a841961da75218ddd5b4e9e784c9fe5148ffe781 Auto-Submitted: auto-generated Date: Mon, 10 Aug 2026 13:23:08 +0000 Message-Id: <6a79d0bc.18a5f.62bc5189@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=a841961da75218ddd5b4e9e784c9fe5148ffe781 commit a841961da75218ddd5b4e9e784c9fe5148ffe781 Author: LuisCastellanos-dev AuthorDate: 2026-08-10 13:09:22 +0000 Commit: Kristof Provost CommitDate: 2026-08-10 13:09:30 +0000 if_ovpn: free crp, mbuf, and release refcount on crypto_dispatch() failure When crypto_dispatch() or crypto_dispatch_async() returns non-zero, the registered callback is never invoked. In both ovpn_transmit_to_peer() and ovpn_udp_input(), if_ovpn.c did not free the cryptop request, release the peer/sc reference count, or free the mbuf on dispatch failure. This results in three simultaneous leaks per failed dispatch: - crp allocated via crypto_getreq() is never freed - peer->refcount (encrypt) or sc->refcount (decrypt) incremented but never decremented - mbuf passed to crypto_use_mbuf() is never freed The leaks are reachable under memory pressure when the OCF scheduler returns ENOMEM from crypto_dispatch(). The registered callbacks (ovpn_encrypt_tx_cb, ovpn_decrypt_rx_cb) correctly handle crp_etype for crypto operation failures; this fix addresses the separate dispatch-level failure path where no callback is invoked. Found during code review following FreeBSD-SA-26:52.if_wg. Reviewed by: kp Differential Revision: https://reviews.freebsd.org/D58754 --- sys/net/if_ovpn.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/net/if_ovpn.c b/sys/net/if_ovpn.c index 19fab11f3dde..28e60efaeaa5 100644 --- a/sys/net/if_ovpn.c +++ b/sys/net/if_ovpn.c @@ -2188,6 +2188,9 @@ ovpn_transmit_to_peer(struct ifnet *ifp, struct mbuf *m, else ret = crypto_dispatch(crp); if (ret) { + crypto_freereq(crp); + ovpn_peer_release_ref(peer, false); + m_freem(m); OVPN_COUNTER_ADD(sc, lost_data_pkts_out, 1); if_inc_counter(sc->ifp, IFCOUNTER_OERRORS, 1); } @@ -2636,6 +2639,9 @@ ovpn_udp_input(struct mbuf *m, int off, struct inpcb *inp, else ret = crypto_dispatch(crp); if (ret != 0) { + crypto_freereq(crp); + atomic_add_int(&sc->refcount, -1); + m_freem(m); OVPN_COUNTER_ADD(sc, lost_data_pkts_in, 1); if_inc_counter(sc->ifp, IFCOUNTER_IERRORS, 1); }