From nobody Tue May 19 16:46: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 4gKgYc75LBz6fS6f for ; Tue, 19 May 2026 16:46: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 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 4gKgYc4knwz3CJx for ; Tue, 19 May 2026 16:46:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779209204; 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=cGgDw8nwi3bfB1zYZCYYnQQ23jtk/tNbMOb3KvoOs9A=; b=KmUwjNlBBZAFo7QjkmaPooC/tKk6RqDcXvjN0iDHLXPxbzrPuoZ5BRJLitNpstVxf63wkW Vkp/Mm2qp+x82aWGMiiRdoLLLscPENLrwN1GlJ4p00C3I8TQk8TkR8U3G8IOCalvazF4kZ 0VW6OOMc47IYPeMLbdudXsBCPXLYe8FslvOUOUzqGuihYiJA4WoAU0cjdj9HT9XVbkqObq ru35aIrNVr5xAYiot2+byh8cSS37Fa6ZCD5fODUwJ7RtWEGLZh4Vju/G2wV2hlkh+AYpzn gP7EH8EODONZW1k29iU3fSgDg9oOwzmAVNVNCSkTSDKPB2vZ+CNq/8W3YbCe4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779209204; a=rsa-sha256; cv=none; b=yhLqrevf/4FTr7+Tdc0MBAgDIWDvU1KvtpFLXP/pmLzSKdpVEdvLLQBaIw8uH71jVOrLvG d/iOCMWHzAda+EwXRsuRpTvY1my5cRYCPVxQxW9Yxe9FhAiuiJ2r992jBAmbvLHJPn2ANR qxoWxne8U5QmeoP30cRpGGDrtBF9xZJIua6p5n2jh9QbQSJvzyeLJMxXd5Rv0PBjfH/NMD MTJk5PY6KEZzOiQl5cybBtR0VHHwKOU61z+XR1DzM4cYma5XSWYpOFLfIg6F6w1nrVjoTP UEQySuJ+/P9CxQfO3vvq8EiBNa5rOZ7u43CAGS7umYpjSriex11hAPD9EzLKoQ== 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=1779209204; 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=cGgDw8nwi3bfB1zYZCYYnQQ23jtk/tNbMOb3KvoOs9A=; b=jL0XJRjfsKhJuitlnPgPFFcytgLwhhbnIj1Hn6HI1oEV1N/7LvnME+rgoiUhJI+USC+9yU 6xorqBWMB5/6ugJ8aFqvMlTe5EL9+Quxr7dco5RyS1zoBKojG7VJfPlsJntQ0+r7QMpSJX Roa9F1UMgRvJLj1O/5m16vWlqzj545JfmV0KDjGa1u+wJ37gFmoY6FrTuS3joD2qcAPXmb 3UFohzmGSr/OsXBOFz7VsAGJq85+9UG8kivCqBZEmxHTdHnQXMnnTyt4Qapl1LObGduErQ ozmGLqLzvNF2zGpmnVSzL+TCjEUUrh8Wf87rAe4SeZRRxSATVcXubOJIabGSAg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gKgYc4HQ5z7vV for ; Tue, 19 May 2026 16:46:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1cbee by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 19 May 2026 16:46:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 74d5c2bb861a - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 74d5c2bb861a6bd257b99697154fd08e891bf582 Auto-Submitted: auto-generated Date: Tue, 19 May 2026 16:46:44 +0000 Message-Id: <6a0c93f4.1cbee.4f539b2a@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=74d5c2bb861a6bd257b99697154fd08e891bf582 commit 74d5c2bb861a6bd257b99697154fd08e891bf582 Author: Mark Johnston AuthorDate: 2026-05-12 17:50:15 +0000 Commit: Mark Johnston CommitDate: 2026-05-19 16:46:29 +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 1f242d86ece5..ac7c352bac31 100644 --- a/sys/net/if_vxlan.c +++ b/sys/net/if_vxlan.c @@ -2877,8 +2877,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; }