From nobody Wed May 17 08:40:38 2023 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 4QLmlW1HzKz4C47c; Wed, 17 May 2023 08:40:39 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QLmlW0sF5z3tJt; Wed, 17 May 2023 08:40:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684312839; 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=4GMr5ZYwgXM+hZcC6XWXGPSuF1q4eS4ryTelzoVHzGk=; b=JYMr0YoLi0DWD+6Fs41Ow06eyfWAFF9VdUUEIixaWO/hL46EXakAKyyvXZzBaLIRcSVwV5 Eb6b8xUGSEdBaW81LIRdhPxKWe8HvnOR8WyysgsqT4AjaXhkRWhEoasHYshnKvywOQNDSE f2eDuXYil6tbsYg92i4QLrQc8pEy4q0NBY8rJC5TEb5i/2QE/axn4NyjKhVMcf/5w0x/bS A4ntWmpBL5GD1z5yLRSzNURz9vnMGIokO6puWhuqUHeEQe1U7hWpWqfeW0tOdBNXpuHLnh 62+D8lYedWYlqeZC7uueS0uezbohZJCqj/2GIMQau9Hhb1atvgWC//htYAbyiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684312839; 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=4GMr5ZYwgXM+hZcC6XWXGPSuF1q4eS4ryTelzoVHzGk=; b=TcwP7Lmu6YjpawLb117lqcsc24azTnwtxszjRU9vnHRsNwAIorVX67VlgJ82RrSFnyfln/ w8bnpX2Mxr2bXOImY5SfQQ0MeyKfywb8y7XMaTO+1tMQLXzi+YVGp9MhB1I2+Z4ehtExBU NUd1BL26nkUWpPWjEHqQaSfBwGpMkg8dEFZgyg2MurhmZ9ysjiaf1fJn2W8Hl37pSAbEUy eGfLFeJViux9+mvWnueE8aKQxGg8PnW6vlwFoAv8GQIdQa09HrpPKpboQDndaUjq0gRbsW eSqbraJvtj0LlormZS1ATSSFpzOJX0CzT0EOvrATdt/RWGZJPnWb3hE2Dn9tPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684312839; a=rsa-sha256; cv=none; b=Pq9nUzwEwzQN8dTZlERayZgciPZYD8XjWb8wOxFPffuWYyZF1DR8RQ+LfhAAyFfltKg5WV 7dt9YQwzNUmAe2hLX4ILqrg8mA+cZu4zR3G6kCTsRGZSkAOCCG7s8zXT4TiUVuITD4+R5o fyynF4c3XZ4yphJgkmqMxYfPYXnYRpIxRnM5r6OKhZDsESQAQZiSzmMtpFHCk6cPGp/c9g K3J2PBgabMc+vezAI5/ukzfH3K7+SiOKeDOCeOczCXHRp131g3Xtg2RT+hS1EmAwTqWgY+ f/Y+YrJfd+R98jo6/EQgX1K2+oestDoDhY+w7h/bLxu4AInpbVVwRhgXOlZDxQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QLmlV73KyzxRw; Wed, 17 May 2023 08:40:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34H8ecTO016982; Wed, 17 May 2023 08:40:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34H8ecWF016981; Wed, 17 May 2023 08:40:38 GMT (envelope-from git) Date: Wed, 17 May 2023 08:40:38 GMT Message-Id: <202305170840.34H8ecWF016981@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 4c63ecf5c77c - main - routing: fix panic triggered by the 'gr_idx != 0' assert in nhg code 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4c63ecf5c77cdd023282c2ab585d139aa0408d42 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=4c63ecf5c77cdd023282c2ab585d139aa0408d42 commit 4c63ecf5c77cdd023282c2ab585d139aa0408d42 Author: Alexander V. Chernikov AuthorDate: 2023-05-17 08:24:05 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-05-17 08:40:29 +0000 routing: fix panic triggered by the 'gr_idx != 0' assert in nhg code Nexthop groups can be referenced by the external code. The reference can be released after the VNET destruction. Furthermore, nexthop groups use a single per-rib lock, which is destroyed during the VNET desctruction. To eliminate use-after-free problem, each nhg is marked as "unlinked" during the VNET destruction stage, leaving nhg_idx intact. Normally there should not be such nexthops, but if there are any, the kernel will panic on 'gr_idx != 0' when the last nhg reference is released. Address this by using the assert checks only when the nexthop group is destroyed during "valid" VNET lifetime. MFC after: 3 days --- sys/net/route/nhgrp_ctl.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sys/net/route/nhgrp_ctl.c b/sys/net/route/nhgrp_ctl.c index 2e9bcd4dc86f..ce5b154859f6 100644 --- a/sys/net/route/nhgrp_ctl.c +++ b/sys/net/route/nhgrp_ctl.c @@ -382,10 +382,11 @@ nhgrp_free(struct nhgrp_object *nhg) NET_EPOCH_EXIT(et); return; } + MPASS((nhg_priv->nhg_idx == 0)); + MPASS((nhg_priv->nhg_refcount == 0)); } NET_EPOCH_EXIT(et); - KASSERT((nhg_priv->nhg_idx == 0), ("gr_idx != 0")); NET_EPOCH_CALL(destroy_nhgrp_epoch, &nhg_priv->nhg_epoch_ctx); } @@ -402,10 +403,6 @@ destroy_nhgrp_int(struct nhgrp_priv *nhg_priv) __noinline static void destroy_nhgrp(struct nhgrp_priv *nhg_priv) { - - KASSERT((nhg_priv->nhg_refcount == 0), ("nhg_refcount != 0")); - KASSERT((nhg_priv->nhg_idx == 0), ("gr_idx != 0")); - IF_DEBUG_LEVEL(LOG_DEBUG2) { char nhgbuf[NHOP_PRINT_BUFSIZE] __unused; FIB_NH_LOG(LOG_DEBUG2, nhg_priv->nhg_nh_weights[0].nh,