From nobody Fri Mar 20 10:03:17 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 4fcdRp3hCzz6Vjk0 for ; Fri, 20 Mar 2026 10:03:18 +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 4fcdRp1Jnvz3R8S for ; Fri, 20 Mar 2026 10:03:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774000998; 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=5z6lPsrWpg5LE3EXn3Q8Qi08dlTnezQTdcUBu/lIHi4=; b=k99LPj+XPt5j8DDXbYjEV5EnuYI8T/ENRq43O1/NDXt2g5JhK65mS5harVeZN3bRcZdrBP zuwX+v1o+AbWybXjDphRHnv4VhwaqXqgW0L31itX1hMyt42nuhgohCbGX+hq0jI7KrGksg i8HnZyWNVIxwNbh3izZG/I4sB7abqb2dNc77H7VmYegU+/Z3B4YjqIu2Bw78YAUSi5/FNA EIa7n/kGyyUBicFhs7GCNekxnN7CdFZgj36RjBaLe6Tqqin2CDcFrBXbxyapb4GuyZ/Rhd IGBS0jx3ToT65BOZjr7ibiDwY+a/wUZo047e8Ie1hpClkoUCXG0HA76LYvMfUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774000998; a=rsa-sha256; cv=none; b=IQlIKb+c9O5WL4JWMC1+pCFRXLns/0axXjKeQIdCOg7Tkdat2Dy/xQAvA5rteoWan09zOr hI8WAO89lrALBhTPX1907bi8+BJw2ut287p3W/OHzzXjrMhmMKX8vKUJVK47jPza+Uc/v8 c08VlCTUdRTmoTuEf20lKVN9aqM5rn4I67Pt+QG7Qww82w4w/iSTc2QLyuEWb/hmLtdNJH gY/zSbW9ETVkbvaKkwy0ylDuZhoQUKQcPWfxCMzRPSHfwAzuWPJ0ZkYj6X78iCMbW0+1ED gr688tihsgUfM6yzfpfN5SQkITvmhTdJOVg65umLQZ9FPsf8cYYorw82fzVuPg== 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=1774000998; 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=5z6lPsrWpg5LE3EXn3Q8Qi08dlTnezQTdcUBu/lIHi4=; b=RmqrHZYAwSz4yCEqsJWS8rb4wf2OMT45Y0ynMq/GjV5Xt4WOiTY7nKrjuklV5ASqhtNiG+ adzplsoxTX2n7R4qPetkDymUzU9Ut57BrHjxL+qo7PoajXdE2U3TWC+WI1tI9aKbdXXrPW 2RsSF4lfJFM/Vc/mseOV7p9Jodwl8zZImOyoOkTeL4SaPROX6S3BPhPaAxJ5tW3GZnNpD2 iTgzi88yEXdcqT+PUXy9V6Ibslx6mvgbifY5GsiVlV/j9Qh4XgVS5oOCdAdqMKJD+vmLaz uGlZ9zYTXPYuAHpjkF0PSGvtHTJdtlvkB9ny/ylb7OR5OOW7Fm72210X74rEYg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fcdRn6Qj6z62m for ; Fri, 20 Mar 2026 10:03:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ee9e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Mar 2026 10:03:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 47339e4a9209 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 47339e4a9209c1d1323f58d792e277792990e060 Auto-Submitted: auto-generated Date: Fri, 20 Mar 2026 10:03:17 +0000 Message-Id: <69bd1b65.1ee9e.2aec72@gitrepo.freebsd.org> The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=47339e4a9209c1d1323f58d792e277792990e060 commit 47339e4a9209c1d1323f58d792e277792990e060 Author: Zhenlei Huang AuthorDate: 2026-03-16 16:20:08 +0000 Commit: Zhenlei Huang CommitDate: 2026-03-20 10:02:19 +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) --- 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 0c7e32e858bc..44f80a51eea8 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -459,14 +459,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);