From nobody Sat Apr 12 22:02:54 2025 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 4ZZnbz0LDrz5smD0; Sat, 12 Apr 2025 22:02:55 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZZnby3Lw2z3jW1; Sat, 12 Apr 2025 22:02:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744495374; 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=oqdNyc8fjk6Jl9+kVS6OD/9XquQOoMgcsF3VfJPmehM=; b=dZL6xD3LV1gnvOQB5ejxtsjGB1r6Aiyhguy4sZuWLh55pdd/eH1ol1sMNnDKuGT/veS++j TdMg1QpBEwhnZVii9Psk5uSSYAnj+ZlKIF2bRGm144wyoFFEvNC6fkvoorMdoNYBpGxkHv eYi7zhUt9/YMui+R6TRHg0qt72WoMtoAReHhVn3xcodKvIBQt8Z4RSB+RYENTTqu3AanGC RTTCb90CSJtTdsemLG9ISxv7j2oktmwt79Q3sd+ayKMrWJwDdDbYxAMelX3bmCcqngx6jP DKzuxQpOLF8vwQmKwTtdHiMJRT4dtkWP3dgLWT87eI/f6YYiCIdKTrANj0QLKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744495374; a=rsa-sha256; cv=none; b=URZz8H2AzI8tsnkmJ8a+/I8HDCCVD/RVOYb10SiZtRc6dveZtGgpJ2u4vmiGUnSq2O16HY 3x6TzzIYUBibiUPCcO/XIcWIOVTWn3Q5MN+vmHjlFMjkR70Sej8mnNY9pAfeyiWzvivpR6 UYqbbGkd/CtSywdYtiMsFZmToy5az6mEYVB0KWAEhsRqcMz592t5OUQiQkEtpFLivZ0HeY NNo25vv/TiEZ7L3396Hv0GOkUZ2jXSNZXNaQ2YmdTcr/KjTlg81V9shmkpl7TF4uYU1T7Y Hrc87N3OYu64XhOikdqWFg65tLTu7plrnS5CdnHyiEVAclaLrehZLnwf8PWuvg== 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=1744495374; 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=oqdNyc8fjk6Jl9+kVS6OD/9XquQOoMgcsF3VfJPmehM=; b=vZmxGmnhr0TUryUOAfBqIk8xqRcXyekBI2W9P98DJebTyITEC7B4Fsv+iyCIWSPPGNRz2Z LGbqGj6R0+XSyGJLK4MUwP/xGyCVYntWkcHOqxTizFrkDvwpNju3Q+vwcr5q5g7Yeg0G4y NuMGghMz/LT2so+QvZ8bsLIL7i5PmSMZXRW+E7WZmjZS/rXMKOSvd/x/ZTs0LcKCihGcB+ Uqvx5+W/ida0hfSvhqhBgjntNML1WCFvF8ktMqsjut4sdeZgfyc10glddEOJ68OJLWKouB yd0mPpeTO/6jdzHPBlBmoyWKE21hA/E3Ab9LK2X+pqZKha+8ppnlEWvheXbc/Q== 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 4ZZnby2v6QzcSg; Sat, 12 Apr 2025 22:02:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53CM2sar042984; Sat, 12 Apr 2025 22:02:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53CM2siB042981; Sat, 12 Apr 2025 22:02:54 GMT (envelope-from git) Date: Sat, 12 Apr 2025 22:02:54 GMT Message-Id: <202504122202.53CM2siB042981@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 59e3dd29ecd3 - stable/14 - netgraph: MFC: prevent panic with INVARIANTS-enabled kernel 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: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 59e3dd29ecd3bf8ec2f2453552773d0525640efe Auto-Submitted: auto-generated The branch stable/14 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=59e3dd29ecd3bf8ec2f2453552773d0525640efe commit 59e3dd29ecd3bf8ec2f2453552773d0525640efe Author: Eugene Grosbein AuthorDate: 2025-02-25 07:18:29 +0000 Commit: Eugene Grosbein CommitDate: 2025-04-12 22:02:16 +0000 netgraph: MFC: prevent panic with INVARIANTS-enabled kernel This change makes NG_ABI_VERSION depend on INVARIANTS in addition to NETGRAPH_DEBUG. PR: 257876 (cherry picked from commit 93b4a54456589e78dcd37f2db8333baff3f3f0b2) --- sys/netgraph/netgraph.h | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/sys/netgraph/netgraph.h b/sys/netgraph/netgraph.h index e83f61d3f60b..10db352e0fa2 100644 --- a/sys/netgraph/netgraph.h +++ b/sys/netgraph/netgraph.h @@ -69,11 +69,20 @@ * modules. */ #define _NG_ABI_VERSION 12 -#ifdef NETGRAPH_DEBUG /*----------------------------------------------*/ -#define NG_ABI_VERSION (_NG_ABI_VERSION + 0x10000) -#else /* NETGRAPH_DEBUG */ /*----------------------------------------------*/ -#define NG_ABI_VERSION _NG_ABI_VERSION -#endif /* NETGRAPH_DEBUG */ /*----------------------------------------------*/ + +#ifdef NETGRAPH_DEBUG +#define _NG_ABI_PREFIX1 0x10000 +#else +#define _NG_ABI_PREFIX1 0 +#endif + +#ifdef INVARIANTS +#define _NG_ABI_PREFIX2 0x20000 +#else +#define _NG_ABI_PREFIX2 0 +#endif + +#define NG_ABI_VERSION (_NG_ABI_PREFIX1 + _NG_ABI_PREFIX2 + _NG_ABI_VERSION) /* * Forward references for the basic structures so we can