From nobody Mon Mar 16 16:23: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 4fZL451Rdtz6VcY5 for ; Mon, 16 Mar 2026 16:23:17 +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 4fZL450mhgz3fK7 for ; Mon, 16 Mar 2026 16:23:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773678197; 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=+EsXrxWrZ9Rg4pNDBV3LdyERPbs8KHPyksKMugVLhoI=; b=a8pAaUv/zQnHKC+eiKeiBjuCKgry7idtsAvSxWHlaz6AZUiz2WHezPmdEL9f7eHJQomw95 BjkiAhByMkLpU+7gbEGyPZnZ1cJzdSFKAipgy8DyAxXpwoDMniFvneRJIZP7j5gDImXlCq ZglLw4PJ7fhx75CeWec7MPS/PQkQ8lBW3RB3ZvKzr47F2bTXC66YlRj19M5jiB/0ZfLcwq 399g2k0VrXfk9uX3tT8OCeWmCOlSPuFI+S6gd5vEkr3yLM7r9hRilhvActXLYHJ99Fgb2C iYvbXtEuWzMgeLMuVHFZqcyVVJieyijNKPnf6Yf96opVrpuqzZgnt1EUf0Cj6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773678197; a=rsa-sha256; cv=none; b=VS70nohxBSt2/0uVj1W7AuUVYtrEo8KcHYxGf8uH+D8uRGmyOBlqfLDqjkFN9u5BcSx7vd tFd+lfpo4FRkOsF+Jie9G1lLV65843Sl1aE+xP66oMDiXCXjQ2oD+aFVFqvK7skaq4OYIe F+e4EzlWd18SygPNrYyy2wdC6Est2Mj41tX3T/QKIbfPhwY8Sjf2VFVb6SZXnAP2pR6h3v 7RvYfAK6sdoY0rjnEi3K3cjP/UfYcLulS8kSl23gbkR+aXFY71XDwtq9L7mvSJnZ6DlIsR A4uvaamm1aX+/PWsL6uQIkH3HE1gtFebtA82BxBMrIfYZkdVSrg1QEPomN/YIA== 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=1773678197; 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=+EsXrxWrZ9Rg4pNDBV3LdyERPbs8KHPyksKMugVLhoI=; b=sCC91Xq2FtgmP1pTF5FYkZNUg8Yl/awlOmOtuzUUAPxtAIepXaUotIX4cZE/gTHjN3zc6T GPhvFU6dUpnkNa2F591/RVGWHsosrWNMjKFAX07gTbyq0S7yc5cEQ0HNWCcA1Q6e/PREbw twiVsCB7eFeUyj338b8VogAvWC27BPqRT9LapGZXsd9L/RiUeIRdZqk/07STEnwEyGeysj +q8hWT2I71gAUfFG26ZhVndSSTpVSBJhRWBh3dIDapIBdK8wCYHPO2YS8YZSWP8mXQ50Ap WASPTZqqCB0GjogkoR/Sf26l5XsTMpH2zVbVg5Ab4CgAN1anRQ05L0xdfL5xeA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fZL450FyxzjQZ for ; Mon, 16 Mar 2026 16:23:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d20a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Mar 2026 16:23:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 8065ff63c0e5 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 8065ff63c0e5c3bb4abb02f55b20cb47bb51d1a7 Auto-Submitted: auto-generated Date: Mon, 16 Mar 2026 16:23:17 +0000 Message-Id: <69b82e75.1d20a.2a36611d@gitrepo.freebsd.org> The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=8065ff63c0e5c3bb4abb02f55b20cb47bb51d1a7 commit 8065ff63c0e5c3bb4abb02f55b20cb47bb51d1a7 Author: Zhenlei Huang AuthorDate: 2026-03-16 16:20:08 +0000 Commit: Zhenlei Huang CommitDate: 2026-03-16 16:20:08 +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 --- 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 96da4da8c6c1..c3f31a28b40d 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -447,14 +447,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);