From nobody Fri Apr 17 06:32:56 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 4fxlSG2lRVz6Z7q5 for ; Fri, 17 Apr 2026 06:33:02 +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 4fxlSG234Pz3K5J for ; Fri, 17 Apr 2026 06:33:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776407582; 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=huvkMoquZmnQUuHeApJfgEptL6/gOh+NN46t8l93Kj4=; b=YDppywuH25RE6meS+9BwDE2/UAXtLrN3EBU2ajDyKlfE7SmWwiMAYdYtiWQQkAODSHDgZC EI/Wo9QtBr8myRBDV5JOYt5Gxj4hliPkBTORqEcIqnKWcexhsZ4Xb2QpCvAtlE98zPRGNU LlE6WW9bP3nJxVN43mIov43cHFdPXsij0tMH6h/O5+5ra+idU2C6vPIf2xEUbO0QD7VW8L VHrXeaMkRR/TRL4m7Qae92VvXHoCAFGP87oWbbU+0B4MY/jaC4Mw8NPq2EMx23/axSMOPI pQARz7QlkPyN6Qf4Da14xupdTVSZQeOT4XJxPfDei2QNR6W5ePuKQIclRlLqRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776407582; a=rsa-sha256; cv=none; b=MofcwWXezvKua2t8GKpShGhJ6xGV7McDcqKV9ZCh0HaADhLYsKS2qdSY8EaHNpDfM1Msno kRnR0F0y3+e5M7Huuayut3jIkYPpK5jlMdpwUQFmAL2kQfA/ak7VhCzLIhuj5nqfb77xaq 37zbtXBs8hU2Hm5dcT8kqWg8EilrkAT1wypcTc6dpMddBzNqT28H4YP8KzIHPyge7BrfSY ju4aZLjLbR9Zv+Lv5xXh/1kQ1D0vQ35Hsfm7++q8ifhsDylqYz9wIS8Jp0rPepVixEYgdt ShHoj3uNgyAyn4XTisnawS3hj5tENUDvSYV8sgBV97lmfFLQY5oLExCnSmH3Rg== 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=1776407582; 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=huvkMoquZmnQUuHeApJfgEptL6/gOh+NN46t8l93Kj4=; b=Y+sUxJJgcXJYB3YwtZQGTdwOp5meOmXX+rP+Nn9I7LLXUdEQ5UJyE+lWeaRKWZNlQl0hbB zK9UKYkAgdyyu91VvAAAgMbMltQtQCfWW+GY4tDJn+dUW6i9BBv7nRGg6iZRAR7GKGJON+ ANKIWeC7KWa/116OtKgVQ0626NwQaLpfhVBdNPVAUyaJCEvOF3wiUDZ78yPKc4rMLhTS5F xklOLfKqRo2cpwI9vAHFdTKI2KJPzR8Ob8p0H3u+wzCBUaEwm0WBGdjtlrGNMooCMyqazF v0eTE9cO08t6nnRqSQuuKYxiAShrTS3yLRGNboO3nGw9pACdmmgJoAopq3RhPw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxlSG1bhDzjlS for ; Fri, 17 Apr 2026 06:33:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 400b9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 17 Apr 2026 06:32:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: c775ed207fcd - stable/15 - routing: Fix use-after-free in finalize_nhop 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: pouria X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c775ed207fcd2036754b8f17a67cae61cf1977cd Auto-Submitted: auto-generated Date: Fri, 17 Apr 2026 06:32:56 +0000 Message-Id: <69e1d418.400b9.4b42bacb@gitrepo.freebsd.org> The branch stable/15 has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=c775ed207fcd2036754b8f17a67cae61cf1977cd commit c775ed207fcd2036754b8f17a67cae61cf1977cd Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-04-14 09:36:53 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-04-17 06:31:35 +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); }