From nobody Sat Apr 12 22:05:06 2025 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 4ZZnfV2kfkz5slwq; Sat, 12 Apr 2025 22:05:06 +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 4ZZnfV23j3z3kgb; Sat, 12 Apr 2025 22:05:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744495506; 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=Mtpt12UtDBicxoZFaQbChR5tOD5DbI9Z5MPWDz6ebXs=; b=f1oWgej2wE3D3n3CBW3vUXKM8nHz3b2KzYSsfKxZToOWPJmxz9HKW74HN+cFhPQmq9Yh+8 sI2FK1lvOJ6XOnK3GRR0HG0Ser3cM+q2UazCt6yM12zGIaT6fGkC6U3jE2f3ve9Gq2Iy9a vtF4KMhX3YI70Ksa5/TNuQTC3pMjJR1YgLW2D3IHwaHC8SVA/bRh5CSrtojNNMccJImMvm z2U6kSGbo1M1FvWNsnfafZgqbuOkfP1p0P9OPt3Eb2+3DtZJoCbKlGF3VeM7Jmb9XrcO6I qgikwSGvGbEmEjndSeIPX0hcd4zmywK/uxwe1jcX+tcBgjROHzOSK4ecLQrG6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744495506; a=rsa-sha256; cv=none; b=Kkx9mUvR8hy6YJNV9VihYbJ1p7EWKcB56P+I+GwxYfcBn6tgP0H7TUl1nIC+Sb4BTAuusX XGGi5TIcZ4rRtXexX+EioUh87p0fPtzPIQ0Batu5epd0zC8qiZNcQgM0sG5uQuzqtGDpSj U11QmK1cv1VnabMrDK1+VtWffrXu65nz8eIBvPJvD6S/eB1uoZagxIzj7V+taCs+EfHXOt jZ+pt7SE8d77D5oW2UUc5evVI3GJVPjt2j9usirA+DFiitt5y+4qRLtzdD8zZpxq8c8kMY U/Fyqtz9eKxpC5aEAiikSLVPyda7+RcLih/idQTjWUVqLda/hYCHJzd/legxvQ== 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=1744495506; 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=Mtpt12UtDBicxoZFaQbChR5tOD5DbI9Z5MPWDz6ebXs=; b=L3323nG8D45nPlbDZpmOwttOHyyLZri3cM3VD+exUdzr8AxrNoDmvbKxBOdsSDP3aV3rU4 YyIJhpDa83Bw/vPV2l0uvCLmxf7+Aet/vIkHQttUpBqavAgRxCVRZuw5dwtGvI9MsH2TKI xL57ASbLXYthptWLFENlLrMu8JIZKx/KF1Qccw941tFEEkD+FQPUCBCZ6xZjSw9c35pZfI iIthPcETZVYmOLrHykNX0WlGxZVdY0Gy9/yw8LH7W0Hgq6y1QbQ66XrWFDqt9hOBgRuKuS T4aWaoirGnvF/ErE1LJCHpBGcpK/vb2pP9rbm1rs9Ng5EiInAWd7e6uTF+FdiA== 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 4ZZnfV1cJYzcDw; Sat, 12 Apr 2025 22:05:06 +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 53CM56eU043787; Sat, 12 Apr 2025 22:05:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53CM56Qb043784; Sat, 12 Apr 2025 22:05:06 GMT (envelope-from git) Date: Sat, 12 Apr 2025 22:05:06 GMT Message-Id: <202504122205.53CM56Qb043784@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: 92c6cc8ee3a1 - stable/13 - netgraph: MFC: prevent panic with INVARIANTS-enabled kernel 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: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 92c6cc8ee3a16f1a6f4dc339dbfa7aaf8f153fc2 Auto-Submitted: auto-generated The branch stable/13 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=92c6cc8ee3a16f1a6f4dc339dbfa7aaf8f153fc2 commit 92c6cc8ee3a16f1a6f4dc339dbfa7aaf8f153fc2 Author: Eugene Grosbein AuthorDate: 2025-02-25 07:18:29 +0000 Commit: Eugene Grosbein CommitDate: 2025-04-12 22:04:43 +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 0c5594588a84..12d2ca99e280 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