From nobody Tue May 12 20:06:09 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 4gFSJx5Vmwz6d1bs for ; Tue, 12 May 2026 20:06:09 +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 4gFSJx3Ht4z3Zbb for ; Tue, 12 May 2026 20:06:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778616369; 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=YZYVYewwpfbuEElL49WvYx/DuWZEyelc5MQm+L7yp1k=; b=REIliy9tq41cQMVP7u7NySrKMphW7+LNeJiMijDretkYtG66BSvCEeeC/u0z1H/Lbh4Ih/ Y8P9k+U+x5BwirKPzS1n/VTf16q+W9kQQu/5E7ljyWi+fQ7gDb04l7NRp6YimwrWV0Revn M16tDjOTPZ2gW2rvxd1zVvn2h0KJGddYtL9lK1c9e4lSrNivE1lk+iLLIlXzM9QDhDxYdz etV7LeYABKdMPjz7dGeK09m3bFLkSRGG+epa1fSAa3DPyif6M1cBEb6wusGfnbc/GqjVtD yTGAqz+eAaQicMiHUtZz0TuMCYuSsozcEYQc+aqrZ9EMVD1PpEB1JOIKEEs46A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778616369; a=rsa-sha256; cv=none; b=RTcZ4XYEkKJK68we5DdnQ+cmMFNxO4YohKAhznsLVlJVIlW1RsH2ksNtwEx0ciiIkDk/m2 R7Cft4uqrtJYFvTm51bC47KW0EhNXYFmW2sABICY8zRbXlbTgdfnQwzJI0AfBnOAiJubQ5 viu2kQd34afjh3sE4YkLEw6cmoAuI3u9Dl67LvBG0ovrRQyqTG3R6NBrFqGA8zEu4fE5kd AYSVu9T1RGv2efwgG1b/MzzMMeqX99w28uBvkdZCBuxu+jyJFiMcOr2NzDkL0bwiSnzIYg ykRlxR12msRthfbZfcTsCieUJWHrFbGO1ewrB1MhWCZ0ViJFLoON88WkIpYotg== 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=1778616369; 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=YZYVYewwpfbuEElL49WvYx/DuWZEyelc5MQm+L7yp1k=; b=jQEWNcGCvpoKUF1EBzPY3NTMyrtDdbTqPbKboSI2Gyuu1+bV5WCutsJsnf5C502gJ+ci49 urI0Ff7dv3DvGEPJOrAaYfA5CyGucTr9Oxehz688HrjchT2aJsnpi4SLtEYWDQbBx6Yse9 O/2eDfSip8pCCdyP83KqsjkP+NsJdhtWkA/uMY0ILUyIPs6bU37m/4pY3Zo+KSvFjdNOyV 8e0WYfbYMRO1ycrux5LJHOiWifmFHv0p8cLPJKpyzI1s4cdLItj+ei7PK7QTxOoLkQEPfT OkBQG1WZHtb8OkEsY5ebs4VszD7z+abb9EDnMTNjgVbzNTTe5NfIdUNy4l5BwQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFSJx0gX4z3Ff for ; Tue, 12 May 2026 20:06:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 217ee by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 20:06:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: a6c4fe2d1a38 - main - 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/main X-Git-Reftype: branch X-Git-Commit: a6c4fe2d1a38885914b1c3e85508b965ccdb7874 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 20:06:09 +0000 Message-Id: <6a038831.217ee.3920506b@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a6c4fe2d1a38885914b1c3e85508b965ccdb7874 commit a6c4fe2d1a38885914b1c3e85508b965ccdb7874 Author: Mark Johnston AuthorDate: 2026-05-12 17:50:15 +0000 Commit: Mark Johnston CommitDate: 2026-05-12 20:05:19 +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 --- 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 3d51c3c421ff..da219217480f 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; }