From nobody Thu Feb 13 16:46:20 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 4Yv1KT62Thz5myVT; Thu, 13 Feb 2025 16:46:21 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yv1KS4b89z3NGb; Thu, 13 Feb 2025 16:46:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739465180; 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=lLEsuaG/2Ogjh90PjYPmaOm2qPYLlgxcNeZU9iQfIgg=; b=fOtVPaEwxuT1yeTysmQG4x9TgTSKkeN+degTnZq3Mr9ipZU63D12cizdmfc1EtCbJwjoI8 FMn3zdZVTgnIcaQkqvh38jFm+kukF6bXY+TCbhGw51UGTY8FQaYTq40pZmvXtqRx/h/kqO BoJjcugzOxPFWtXjWnYjo0Cv0dAtFfrxvFH5sZ07O+qQ48vhCAR0flPz7Dj1ou7Sfr70DN mbCOrp9Oq+r2QpzMd11imnIyGTzg3KZiDSYDs0cyUGilcgZyUQvZMQjxNyoP7lE6z7pY31 Uiva91YKAT2SgSUOp7kM9r0ZawiiBs+Ot2/gxBO9xHy2GQzqfPwIwgGIH5qU5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739465180; 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=lLEsuaG/2Ogjh90PjYPmaOm2qPYLlgxcNeZU9iQfIgg=; b=q4iwGbBLrJt6E1DcCqxhx124u1nnDpuLzEbN/6L1St3v2DmujcPSncX6mLmhJTiPZA8RVD hcVHVHsAt2C+g5sByLn5rl0B/LXxTs3IhkvJ9LpyjHvhopgur8IoE7WlMKsgbzn0omLJHd zone8zv9+Q6KdczuNpF9sdrNB7cympGlpYkxfU5O5VWpvmoC7oEoZuRLJw00mtFaXNmk41 lRT+pRHUg9FFIYmxuW0iBve8Nstfvoc5TR45YTCvvH6saMsbRsS17eAbAmHKnNZx56Y4/m eYp9FlIATDiCm5yuNgi3DM+Fx8RMEMy8BILS1plZR1AFEtKFlgLFbRG5yw2ovg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739465180; a=rsa-sha256; cv=none; b=c4eSSVvF6Ry6nCQXSx5ljQkDz3MEt06dyAQ4jJpdNdPE26DShtSg7g26wo7Q0amZTuZXvn sBxybHzsFM0pJkmVV8jEGA6x/m8HzbAe+mwLshfwYyw3u/pOgkaHpbztqkyPwF2+enkmz6 1S/Whh8ACM5vtz8WpH/5cS1KmY9S5wDlAZxjDJo4oULEMq/DCwaUrHJZKyywek5aoJeKTt vC9+nYfwTgSCvg4VgU4H2ptS2edFLDhax1Q7XJI7xflQf8kcKVTxuBirdNiD4ld4ZDMOQo AxDsqfXvM1MFgPDIaHepm2++iwyXHowGVU0JgNCoZ9Wc7313mMZgEhasqOFZGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yv1KS46HvztTp; Thu, 13 Feb 2025 16:46:20 +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 51DGkK0a041773; Thu, 13 Feb 2025 16:46:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51DGkK4x041770; Thu, 13 Feb 2025 16:46:20 GMT (envelope-from git) Date: Thu, 13 Feb 2025 16:46:20 GMT Message-Id: <202502131646.51DGkK4x041770@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 5f2744d520e9 - releng/13.5 - icmp: improve INVARIANTS check 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.5 X-Git-Reftype: branch X-Git-Commit: 5f2744d520e914a38770681ef75bee501dd7b49a Auto-Submitted: auto-generated The branch releng/13.5 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=5f2744d520e914a38770681ef75bee501dd7b49a commit 5f2744d520e914a38770681ef75bee501dd7b49a Author: Michael Tuexen AuthorDate: 2024-12-12 14:40:49 +0000 Commit: Michael Tuexen CommitDate: 2025-02-13 14:03:55 +0000 icmp: improve INVARIANTS check Actually check the conditions that are enforced by the error checking code instead of a condition which is * checking a number to be non-negative instead of positive * depending on a random number Perform the checks consistently for ICMPv4 and ICMPv6. Reviewed by: glebius, rrs, cc Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48001 Approved by: re (cperciva) (cherry picked from commit c9febea3dc8ac8e308e8fc5a2e74dd0313fdc5d2) (cherry picked from commit bd6a89a6c32a0f5b08182ea06e625a6695f3fbb0) --- sys/netinet/ip_icmp.c | 2 +- sys/netinet6/icmp6.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index 67adc1245b60..f4b697f30eee 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -1142,7 +1142,7 @@ sysctl_icmplim_and_jitter(SYSCTL_HANDLER_ARGS) } } } - MPASS(V_icmplim + V_icmplim_curr_jitter >= 0); + MPASS(V_icmplim == 0 || V_icmplim > V_icmplim_jitter); return (error); } diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index a26348640cbc..52430f9146ae 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -2856,7 +2856,7 @@ sysctl_icmp6lim_and_jitter(SYSCTL_HANDLER_ARGS) } } } - MPASS(V_icmp6errppslim + V_icmp6lim_curr_jitter >= 0); + MPASS(V_icmp6errppslim == 0 || V_icmp6errppslim > V_icmp6lim_jitter); return (error); }