From nobody Fri Apr 17 06:45:22 2026 X-Original-To: dev-commits-src-branches@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 4fxlkV3RM7z6Z8fp for ; Fri, 17 Apr 2026 06:45:22 +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 4fxlkV2t4Rz3Mc5 for ; Fri, 17 Apr 2026 06:45:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776408322; 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=S/o63NAU4NeAIasYn2Y/VvPDhU5DSIolmGIsYtdFCAE=; b=MJLJlvdfibbc2a5gmhtKdYvADelxfb584hzSTuV7dzauTQda9LvlNnTBdF5jAuGYj4UDy8 sYXeHWdwwDE6HFUxyy8PEDrvUY8vakogSbvOazKwb4QFDPRYplo0lXbvJKhF/kRRMZoYa+ Ck6MGFU6GrV7p/K0AJY+CshCRIc4nCWIYMTRKkEq4uB6zirGhCzxiVYEoWEJPPiGFRXPvq PbxWOaHfJH20QAQjh8VSFGIbP4rkOrfl1nRPliQqTKiN5M8gWl3k790yz7wUgdXapt3+iY 6p39RYmjNGLQPTcfQPCtdho4wCEj5vig30Jc1xFJ9nw+TldUh1JTxVr9xFhbPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776408322; a=rsa-sha256; cv=none; b=ssr8vlyi8KlHT7WjdAxU0REMqvFRGt/hcN48UXjUbrA2vsH1au4vHJaFZBNadT73Z0tDuR ZHUK8TYPnYVqE0lbh54dD43aS80TN8/Jps39v7BRMBhDKSb5jOb5AOU+Ph1Xjob4Fx7D0m 36TmeLnHsorZf+nCips+aei5uG3CyxUdMly4UZSWe/8fCeRl5zAA5E03ePAmbiVb1u+xIG u9wWAWBhR49dCs7Z2k6dnOMxQRmtzToqKcCYJVS9+puxVBLrryM48Q6Kr3Z1MUU2p7QDep jkDKs6vRQEOQbLo/Ji+i2suEpJjh2sH68Zn4r/+mW04gAQ4K8vivTJjmCrcMaw== 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=1776408322; 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=S/o63NAU4NeAIasYn2Y/VvPDhU5DSIolmGIsYtdFCAE=; b=O7rrgvdqfOF0bwaiwl98GhspLODwyHyeJhYGgbBDHFrXdyl5xYI1A0dHjKHK59D5G3MJJL MFkBt1ohI0ABv5WM+MM6zYE3yZX/+biHU3dH3ZW4ojckm+BCfE02+GNK6bhQQhzH508+Hq Z9LzlZg8U2wLYjN/9861Rftf8MDEf31psXMOWMRUurBV9EZx+MAkAqDJTuAFBhLoAvLCnf TUsHZVAb3ZLNdP89VodtjTfg4fP7ooxglaEsixqxs6/Q5ksbuZyupgBv/TFxi0qDYzVr65 dO2T9CdhNsQzr7ByLkrCooYHkbK8PhJGZ/5ZdoJvOuE/y4ZUd/LWQt25QCii/w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxlkV2GRvzk7J for ; Fri, 17 Apr 2026 06:45:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41a24 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 17 Apr 2026 06:45:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: 67a7c5f70986 - stable/14 - routing: Fix use-after-free in finalize_nhop List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pouria X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 67a7c5f70986a24a8374146e6bcce2005e767b6d Auto-Submitted: auto-generated Date: Fri, 17 Apr 2026 06:45:22 +0000 Message-Id: <69e1d702.41a24.9526035@gitrepo.freebsd.org> The branch stable/14 has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=67a7c5f70986a24a8374146e6bcce2005e767b6d commit 67a7c5f70986a24a8374146e6bcce2005e767b6d Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-04-14 09:36:53 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-04-17 06:44:34 +0000 routing: Fix use-after-free in finalize_nhop FIB_NH_LOG calls the `nhop_get_upper_family(nh)` to read `nh->nh_priv->nh_upper_family` for failure logging. Call FIB_NH_LOG before freeing nh so failures are logged without causing a panic. MFC after: 3 days (cherry picked from commit 7d38eb720a8d8345949986d779e785984ae19ae0) --- sys/net/route/nhop_ctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/route/nhop_ctl.c b/sys/net/route/nhop_ctl.c index 0c028c7ae877..30c73188600d 100644 --- a/sys/net/route/nhop_ctl.c +++ b/sys/net/route/nhop_ctl.c @@ -492,17 +492,17 @@ finalize_nhop(struct nh_control *ctl, struct nhop_object *nh, bool link) /* Allocate per-cpu packet counter */ nh->nh_pksent = counter_u64_alloc(M_NOWAIT); if (nh->nh_pksent == NULL) { + FIB_NH_LOG(LOG_WARNING, nh, "counter_u64_alloc() failed"); nhop_free(nh); RTSTAT_INC(rts_nh_alloc_failure); - FIB_NH_LOG(LOG_WARNING, nh, "counter_u64_alloc() failed"); return (ENOMEM); } if (!reference_nhop_deps(nh)) { + FIB_NH_LOG(LOG_WARNING, nh, "interface reference failed"); counter_u64_free(nh->nh_pksent); nhop_free(nh); RTSTAT_INC(rts_nh_alloc_failure); - FIB_NH_LOG(LOG_WARNING, nh, "interface reference failed"); return (EAGAIN); }