From nobody Tue May 19 14:08: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 4gKc3P14Ptz6fFm9 for ; Tue, 19 May 2026 14:08: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 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 4gKc3N61szz3hDv for ; Tue, 19 May 2026 14:08:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779199728; 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=7V4+bMufHfkiOBw2Z/mhKMyVVBGs9g8fbfxSp9JxfMs=; b=oeGX/lOdd5of8iEd06Zz8viK+Q0qx8uZg048ctxzO41RIr2XOcy1OpY5muGi21cZlGM1Q7 9tYdnHceU8lJeWultVBvhmFPqcqP76/8YmMoqxg21yQqoIVKGLYWgIsg5KenZ3sQJd6u7H Fc9GhDPH4vaJFLJqk0J8JvB8myY7Syrn2lSGXUZuarXWI7Z3aglT9CeSsAr6fAegYEuq53 enzfH9iAjfhcvMHJjBnw846eUb7Y9AWtOPF771F4r/AODWSHf0HhnVKQby9rTrrgvMYhgx DwWHyOrqGv4+nwm2Oyg0dctI3kXw75f0P7mB6olVoacxsLUznWyr0RqJjA15lg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779199728; a=rsa-sha256; cv=none; b=rFRXFJqnnzY9LdtYbHfQsuHKnSICXAbbb/wwB2zepOa+LOcxyMJOB928bLYvGGn8dY9kuj jBownaWT/3E6WxarG0wNn2XCDwHAs4CcOeMD3AZgaCA47KpDReg6c0YKdhBLd4Ftn4sqdh 6K3NhQIDenC99QT+1EvInYxMr4g0baBKbOJJxcZF8YghJ0QW8emP+6lRvUiqUDIknCXRRi mPQJAb5dVTGXEBwySc0XgGadDne1CwPKxXMouprNcreyulEDRiFYEx/Z/lzk5A05nEM5ve ty53ydt3HIF2BR3QlMFutJ7T8PFJNiOfRYnla4A/IAguyOHynmt0PALWwviHag== 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=1779199728; 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=7V4+bMufHfkiOBw2Z/mhKMyVVBGs9g8fbfxSp9JxfMs=; b=n3MZAdlhRUWkc5fi+8qQEZjPAhq6zn4mw1VP2n8gUwvLCaCeQSK1n6fJ2XByns+MptK/nx GfD45EUxk7ACZwCLbC77roTiGbXBkeE1JF2WAoZ6w5hiq+H3oby3NUS9weflVPwEXy8mw6 7sPbbyaO6BhfjrX7VTX2um+F3A+hKURWcECtrSsEHcZkX2gCdvTEE92DNDJl/cVSI3eCvY f2Jf+wClAclLVgJKpPayuavA3ludnvXZIYSt5OQR3P/H7YmD3B17SmT+uoidJr2zi/GmFv VliFmxZoP9GT38LG2p+I12YeNqv/lhKCYCKwp5eLZpTMHOlwaEZWCgQtOlSRfQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gKc3N5K56z2RR for ; Tue, 19 May 2026 14:08:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3add7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 19 May 2026 14:08:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: b84629b21aea - stable/15 - if_vxlan: Update *m0 after a pullup List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/15 X-Git-Reftype: branch X-Git-Commit: b84629b21aea01a70f389fe30d02f70cf71be896 Auto-Submitted: auto-generated Date: Tue, 19 May 2026 14:08:48 +0000 Message-Id: <6a0c6ef0.3add7.466699a5@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b84629b21aea01a70f389fe30d02f70cf71be896 commit b84629b21aea01a70f389fe30d02f70cf71be896 Author: Mark Johnston AuthorDate: 2026-05-12 17:50:15 +0000 Commit: Mark Johnston CommitDate: 2026-05-19 14:08:32 +0000 if_vxlan: Update *m0 after a pullup vxlan_input()'s caller is supposed to free *m0 if it is non-NULL after the function returns. vxlan_input() failed to update *m0 after the pullup however, so if it hits an error case after the pullup, we'll free the mbuf twice. Currently this can happen only if the interface is brought down or due to a packet loop. Reported by: Yuxiang Yang, Yizhou Zhao, Xuewei Feng, Qi Li, and Ke Xu from Tsinghua University using GLM5.1 from Z.ai Reviewed by: pouria, zlei MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56944 (cherry picked from commit a6c4fe2d1a38885914b1c3e85508b965ccdb7874) --- sys/net/if_vxlan.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/net/if_vxlan.c b/sys/net/if_vxlan.c index f3a8410a2258..fc3d3752e0ae 100644 --- a/sys/net/if_vxlan.c +++ b/sys/net/if_vxlan.c @@ -2876,8 +2876,7 @@ vxlan_input(struct vxlan_socket *vso, uint32_t vni, struct mbuf **m0, ifp = sc->vxl_ifp; if (m->m_len < ETHER_HDR_LEN && - (m = m_pullup(m, ETHER_HDR_LEN)) == NULL) { - *m0 = NULL; + (m = *m0 = m_pullup(m, ETHER_HDR_LEN)) == NULL) { error = ENOBUFS; goto out; }