From nobody Fri Jun 5 21:49:30 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 4gXFTC5YQbz6gbVt for ; Fri, 05 Jun 2026 21:49:35 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gXFTC2lB0z3Tnf for ; Fri, 05 Jun 2026 21:49:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780696175; 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=8qXL2Ws3s5j0wsLy+OZ6C+UOOOdP8/e6WaKff8PgYXI=; b=g5q2Xp821PurDlZqaqFxwMZftrKAUEJ6+45Bs4SnYYyXUnmtQMcxeYVQODJ4AXg2k2/Ob5 J9yOTLcYWoQsFiCQclfvqU2tryWbBTvnlOvtas/SSPPNwDyoGhxsB4EMEUxLIBaUq9PLb7 5kM9EJvagp/x7tdn0f3mOvg/EFKDKbvB72aIX4KHW9Ik1rZY8LsjzDQ/Tko+uqA0I9WhWa l4EhOjH3OqWtCIqht1iQHN4RTKw6kQpbwLEqTpCn3Z3uMcpjZzdFXodpgBsaLX25IQPfYq O7rIjsaIawyQik9SeYjnAj0LHw8Ph8bcZs6i30ZixKD9AAyu0HRNFVMBsVeIIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780696175; a=rsa-sha256; cv=none; b=WXMIUXxV+AQJeHMYID0wwejPGj59JnkzH5tt6t6HT8MrFVjUBtSzfBGg2VQPvXsqyZMT8G Nx1jrXR1FWyt12BZKSSHT5LHwTWzSbT/izf8H72CSB9A8q0DeYNc6aZfIzlrNNr16T65Sl CN8XVgAsL1fDC/AdtE4ifgDDSVCfY0W1AOyuD/i7qdxaq5FgY0awomphfkG3fn0pQ/2PL9 UjXhUl9o9jap6GWniDenmoFH1WCzp8AbI26SvuFdBc5xcgG7OOZObQgOG8w70zkZvnnh8H CK6zPgTmT0EXgus0uDxcXrfe72RRrsKaYaxbjLwgStTZ41BbJwJk3g5pBq9u3A== 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=1780696175; 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=8qXL2Ws3s5j0wsLy+OZ6C+UOOOdP8/e6WaKff8PgYXI=; b=iq/PrMfqwrQSarKIslsjwFU+arbmvmCmVDrj4COKN79+rXDwXVlRx/xC0VLGegQP7YXDCy SpDEQYLhj/JxUB88OdbbOoJS7yQV6mDiiClOdgHT0FdGd3rg643jhuiKCBXXKYz5HnnbGa WeGQUeYcrQqg4ul8+CPKCHehre7A+CFdPi2+OGNZcptTn5rjiz9TCTmPSvg0C8r9Nr/G6T 0MCah3DpfhnAMzdsybgCJ+C+nHgI8wQtaXMUsvRjJP8mdDDNiU56FqSlWiZyVYqQNb46j+ uPz+rWGAywKmLWACLSrd8Cd7Pm9ROqHXwAkQ/TS0C4KATgPKtbIEh09FBilLDQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gXFTC1p9DznLv for ; Fri, 05 Jun 2026 21:49:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1864c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 05 Jun 2026 21:49:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 520e0f576f71 - main - udp: Fix resource leaks in an error path in udp6_send() 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 520e0f576f710eb60fb901b87b4eb0e1530362ae Auto-Submitted: auto-generated Date: Fri, 05 Jun 2026 21:49:30 +0000 Message-Id: <6a23446a.1864c.50362190@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=520e0f576f710eb60fb901b87b4eb0e1530362ae commit 520e0f576f710eb60fb901b87b4eb0e1530362ae Author: Mark Johnston AuthorDate: 2026-06-05 21:48:35 +0000 Commit: Mark Johnston CommitDate: 2026-06-05 21:49:11 +0000 udp: Fix resource leaks in an error path in udp6_send() Reported by: Andrew Griffiths Fixes: 069a67374ed9 ("ip6: Remove support for RFC2675 (Jumbo Payload Option)") Reviewed by: pouria, tuexen, glebius Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D57341 --- sys/netinet6/udp6_usrreq.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/netinet6/udp6_usrreq.c b/sys/netinet6/udp6_usrreq.c index ede791a7d175..6ef79d2fd868 100644 --- a/sys/netinet6/udp6_usrreq.c +++ b/sys/netinet6/udp6_usrreq.c @@ -862,11 +862,9 @@ udp6_send(struct socket *so, int flags_arg, struct mbuf *m, ulen = m->m_pkthdr.len; plen = sizeof(struct udphdr) + ulen; hlen = sizeof(struct ip6_hdr); - if (plen > IPV6_MAXPAYLOAD) { - m_freem(control); - m_freem(m); - return (EMSGSIZE); + error = EMSGSIZE; + goto release; } /*