From nobody Wed Feb 12 14:06:54 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 4YtKqy4xmCz5mqny; Wed, 12 Feb 2025 14:06:54 +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 4YtKqy48dyz3wjV; Wed, 12 Feb 2025 14:06:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739369214; 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=eYPlGQSE4rRQ5yuliroi6CDhD1wDJcKwEIizx66aEc8=; b=SqKBG6scexxn31vtAGvzzpST18hOsHKgXRgSu4Zj8dYQm3GjFa81GxB0PmH7b7Bi9KW3Be 6voWh0qnbmCYiOqfmV6GZSmMYyZgF0eDoHP7ojMoRvK1gvOL162yf2BYlkfOMUgTZJRUYq Re54mWPA/3NjQFVcxCwtblk+RO4gwqzsm2ZX+hclDbx17gIW4aqNxWLj9NlsO8jzZEaOrP 1OB+xlePrD9jHa5zy1bFZLeQoE/VySkUQEuKbfbkpFeahA0+pAYxsV8kdeg9AfVWIxRg1V b1CaEXnvJ3cVf32JHagOLatoaixV83MUNLmg2ZICAYYlIL/HexGc74H/vdAX1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739369214; 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=eYPlGQSE4rRQ5yuliroi6CDhD1wDJcKwEIizx66aEc8=; b=tBXvXkSy5K7Ynybrr87qiU98NRVfvbenxsXe0I1/xUcrxN8WS2zuLzjl5n0+2PSpCoEcg3 e4OomQ+PlRYewMGABAyTvh/WI5td9HARZC+VJLJx0r6hK5MsmJRaG2ZcqSsT6Xa4zJpNsT Wku8oUxb+xhNq0nTJacHxb3UXc87Q7rsZ4fVkDKU5wGnCjkpczbud771QBTFCHLTjFSLOK aPkQAZ9NmsyKms2G+1d1csFSIc/6me9VP6JSg3+rQVgWnrPTDbHhae6Gcvb3m30tXJF3LO oKhcCP2YW6NYielR0vZvgRp5tVqPj2VFawnNQpVSXF0PPezLG/wVmMeXpmEnCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739369214; a=rsa-sha256; cv=none; b=O61i4UX/j04rb/397lnQDAnwjh8rFlWNfER4ARw7Y42LnEfUfsVx/gShbq2XW/755uIrGq YpJni3XmVqzEz6z64XOX3V/P8dBWiU+U2WE7iBaMvD/Yz3Q/Mskpk0uMi/diW7Pcc0Nba9 9rmzk4z+pV0jW/IekfPEjJkG3l0xV8TeSEiQNZi+M4hHfl3OmvAd63rHt5nz57/kWrkAai XJ7Q9tN2rdZ5FIIaGE3cFQNCgJdCIC9fXa9D+DnAVMUzhc83ZcXmAwobnUhhbZADMgpwfv 6WXE1/y39asy2sdKzKe93ZflT/V2EkcrPj0jGJhvWvMpbOJq3459q21GWw/rug== 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 4YtKqy3bxKz129h; Wed, 12 Feb 2025 14:06: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 51CE6s58043053; Wed, 12 Feb 2025 14:06:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51CE6ssA043050; Wed, 12 Feb 2025 14:06:54 GMT (envelope-from git) Date: Wed, 12 Feb 2025 14:06:54 GMT Message-Id: <202502121406.51CE6ssA043050@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: bd6a89a6c32a - stable/13 - icmp: improve INVARIANTS check 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: bd6a89a6c32a0f5b08182ea06e625a6695f3fbb0 Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=bd6a89a6c32a0f5b08182ea06e625a6695f3fbb0 commit bd6a89a6c32a0f5b08182ea06e625a6695f3fbb0 Author: Michael Tuexen AuthorDate: 2024-12-12 14:40:49 +0000 Commit: Michael Tuexen CommitDate: 2025-02-12 14:06:14 +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 MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48001 (cherry picked from commit c9febea3dc8ac8e308e8fc5a2e74dd0313fdc5d2) --- 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); }