From nobody Fri Mar 20 10:04:16 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 4fcdSw65r3z6Vjk3 for ; Fri, 20 Mar 2026 10:04:16 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fcdSw57lhz3S1G for ; Fri, 20 Mar 2026 10:04:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774001056; 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=OUtwJ0qOdPehrPulMKqPqxxJlcIe2EatL+SjMI65x9M=; b=wDcVXZZXWYCElVeDmH4TV9j4UF+9W6hmdzA0zq615RLk73g2Frglqt4bZCv3MsvI4dev/Z MJ2qRwGeWq3EKA+Cz2/EU5DLq8aoOQznwJVPlnLabbZblhowT4Oa11RKLtJUcj4iYkvglR C5eEs2BiVbgQComEXNizOYvNbGFCMoc0UzIE8U+vdldWJ7VXuR7iRxyQc4coFufQJUpVJW woIE+9XrvcxOBI4o9BqhAEx0NvJhtBnM6h59fqQ1XoEuRZZdLRlkTl2LvBJETI7u7li4kJ BsRpgV778Tdh4mbaxSvyz3Rbpio5A7NrgT29qlDotV6HBnBP323vsWT7J4Euww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774001056; a=rsa-sha256; cv=none; b=SCGFusQxNkfMcWMzNBo1sNLqshxYdW0pRGg809GAcP97745EerxWErvz5oAqAEL5d2dwDr pVw2/7CkW+z5YBsecGub3UK5WNyinKyXPRHeCyimimICXOpbySEq/M6Y59+hSi3ROGJidP sgjvA1UvRCBOxCQLETJVh6uL7axh/J86HhciZX2ENL02RnM4CCmQhO6K6FgwLiKHRfu3uN MxE1VOOJ0PRYASdZf4DpOe/gosKypRlsMFC7HufiHiU0N7U405exfoxhR5jv+DnKnPTymb /0Hqelv6tnDJPysRPF0NsfwVDnxa17cM4Fn1Gkq/Q5/J9WcXmJpAXeubhltZyg== 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=1774001056; 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=OUtwJ0qOdPehrPulMKqPqxxJlcIe2EatL+SjMI65x9M=; b=K0PbZTSVYWSMpYVPxzLyNSkw2EoYnaMycy0nNO/NUPj5DPGcCqgntvqftrasKDho/T4T8n MY73Ywo8/UercBC9ASHxhcHJGWw6Pr+8jCfeN1ibqd1hlPbp2ZziH2jsVLuh74UQQaPJ5E GCQoYs7T9akkwrGJ38ity4EpR1kF+bPsWGfYqveIUwFMnl7CZv+bSB9zCS1i3u/klFt3rW uittG19Bd8FCLzKY/rEFZEuX2RxWMeBXTNvKp+uAA4g9UEKeGXY0NRnNEvUsYMQn52uPhl 7rTgC308oPLv0nPa7L2V+GV5+Ezfay0R3Cis0F2MWSEV3qjowCjdVQ/fNR/V7g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fcdSw3r0Gz5R1 for ; Fri, 20 Mar 2026 10:04:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1efe8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Mar 2026 10:04:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 2265cf938ec3 - stable/13 - ifnet: Fix decreasing the vnet interface count 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2265cf938ec30d9658d787d4128541cc7b9bd67a Auto-Submitted: auto-generated Date: Fri, 20 Mar 2026 10:04:16 +0000 Message-Id: <69bd1ba0.1efe8.390e2980@gitrepo.freebsd.org> The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=2265cf938ec30d9658d787d4128541cc7b9bd67a commit 2265cf938ec30d9658d787d4128541cc7b9bd67a Author: Zhenlei Huang AuthorDate: 2026-03-16 16:20:08 +0000 Commit: Zhenlei Huang CommitDate: 2026-03-20 10:03:43 +0000 ifnet: Fix decreasing the vnet interface count It should be decreased only when the interface has been successfully removed from the "active" list. This prevents vnet_if_return() from potential OOB writes to the allocated memory "pending". Reviewed by: kp, pouria Fixes: a779388f8bb3 if: Protect V_ifnet in vnet_if_return() MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D55873 (cherry picked from commit 8065ff63c0e5c3bb4abb02f55b20cb47bb51d1a7) (cherry picked from commit 1b7687f053afcf251ee7643ee5a4f22a225f4a02) (cherry picked from commit 47339e4a9209c1d1323f58d792e277792990e060) --- sys/net/if.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/net/if.c b/sys/net/if.c index c642e99136d8..3835ed57fea9 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -485,14 +485,14 @@ if_unlink_ifnet(struct ifnet *ifp, bool vmove) CK_STAILQ_FOREACH(iter, &V_ifnet, if_link) if (iter == ifp) { CK_STAILQ_REMOVE(&V_ifnet, ifp, ifnet, if_link); +#ifdef VIMAGE + curvnet->vnet_ifcnt--; +#endif if (!vmove) ifp->if_flags |= IFF_DYING; found = 1; break; } -#ifdef VIMAGE - curvnet->vnet_ifcnt--; -#endif IFNET_WUNLOCK(); return (found);