From nobody Fri Mar 20 10:01:15 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 4fcdPS1tDDz6VjjD for ; Fri, 20 Mar 2026 10:01: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 4fcdPR69Qxz3PbM for ; Fri, 20 Mar 2026 10:01:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774000875; 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=jc27HTX3SWcwyob/Gq8bE+ESFrNJKxzRojT69RIevqk=; b=IwUMlTGGU0nhbU3gI+Ihb+aSfAQYCX2M4eNYPuQu8QqfpYE+SEgSt7Sfssg+lwVm0KhIoa ZpjoE7Pl40fwKVB8YFsy5ACgDK6Af0PpoxQcrMmBYz4AKuOzXEar8sHnSKH4ON63AJpZCK bftNeyrTZq7V875JVhTUuwFep4SamYzY0wo7hNhAJy2C9WdTaTYNE0b1EK5PtMVuZfN3k6 W/9U9x+k+q3QHDOb1CGnOeuFqcY6RRfXc/wMF4nqFyPT8ty01JW7UG6CmGnad1Ga5Zpq9v efQZZkayll25XJQEfmLx0Ugt2FwlL+qM1bleXiG/UYa+b2XDrR+yFHBVIoNIMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774000875; a=rsa-sha256; cv=none; b=N6n7ULR2bEmE+ZfqGQqBvkqZq7Btf2bgLeSWKNj+q0M9lV1Kes/FCl7UvEI3BpajwPmTBF scIjZS6iEEtKQRhPXKvYSQUeFoF3nUnuZSRY+zoVgr8l6uQ/2+PpjRAUeXZNyQLYQ3zFvd oDwsFNFPP09D6YRdTCohHypIE8bNj0fmj4vTilsbWTL2vnoTxV8Zcm0lgEoFzeS/0FNwfz AhEcIbRdtchqfOY6a0neQGIouCCS3MbFbZKmi/wb5BWUuSoWgC+oFN9zhxMhSNiuoIk6R8 4EwFKqIEntBrIQFeDyyZhrz3pfs8JJYtFh2//W5YubG3NnwHXB13aaHmNCevVQ== 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=1774000875; 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=jc27HTX3SWcwyob/Gq8bE+ESFrNJKxzRojT69RIevqk=; b=VV8WSkDnGzVkSqArOOYuKxC9S4YBm+U9S3ne5UhBlks0HIPUUoNAFYCE0P/MAflFiCM1/l Rsz0XKTu/t2ntfghwHWI/hYPxFUj+nhblz7sHOkHAivugj/i+utqurjVw1pOeoMfmOW/m/ z4ry1fHi4pHcIVIo8RA/g0q7UzNWDk3mwAoJBO5N8hYAH/aKABE1Xaf/jEK7gs7cjxGnq4 Rp9njIEcIMOG1oOKfuEV3R2qz8Gp+3r7O/W2d7Iw0aDoMAvBm5+0BMUhC9r3AUcE3YfksS lEXS8BvPIIlVyyM1HERAhCu1Ird1ScqcrVBLCgyYHnYs1b5s9hTH8a7pBn6bjg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fcdPR4mWxz5QZ for ; Fri, 20 Mar 2026 10:01:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1efe3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Mar 2026 10:01:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 1b7687f053af - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 1b7687f053afcf251ee7643ee5a4f22a225f4a02 Auto-Submitted: auto-generated Date: Fri, 20 Mar 2026 10:01:15 +0000 Message-Id: <69bd1aeb.1efe3.75b69569@gitrepo.freebsd.org> The branch stable/15 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=1b7687f053afcf251ee7643ee5a4f22a225f4a02 commit 1b7687f053afcf251ee7643ee5a4f22a225f4a02 Author: Zhenlei Huang AuthorDate: 2026-03-16 16:20:08 +0000 Commit: Zhenlei Huang CommitDate: 2026-03-20 10:00:21 +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) --- 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 cb9c47c14c32..9ea5f9778d98 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -457,14 +457,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);