From nobody Wed Feb 5 18:44:31 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 4Yp8KX098zz5mBL9; Wed, 05 Feb 2025 18:44:32 +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 4Yp8KW5Lqrz3YrN; Wed, 05 Feb 2025 18:44:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738781071; 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=/P2bb/i+CLAxhxxEHkYU7Z8NN2Fh/Bhg/4yeTWaxxxA=; b=Dn1PWG15/lmNclyHWqcjefd0IHM+d3KikMqrb/9If72mIcD28cmNNhRAGO85DVV8pSFZUV K+P5XOuexYG88mlqHSGhQ3usBBjGJLQdKAavTzZntfbsMhtYgyvXBA77+DnIObNdVELC0G 8Td7GxMETxejVHXfwD+hS0EC2oLLmNQZNW4GJPyDoLsLT3nzdZVVu1haWn7RCSeFuXc+Ey M8SS16wC+8dU+CplCEHtypSRPf7JB+GF1IT1sCasjY9WZTc4OhBXAWzVPm66d4EsHuYgB3 dP5E5efRSI6If0vtzCIsP4nVSeTOD06OWdfu94eImnMf0OFkymAV03PWGkQJlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738781071; 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=/P2bb/i+CLAxhxxEHkYU7Z8NN2Fh/Bhg/4yeTWaxxxA=; b=bilmycz8/zogVVBVyo9niXYEfCXGWe/KuZ2g7LI/A323WRmyZpMKdi6dWWa0nKHiUN9mJo YessXfpVj9P18s4AVAxaiMKKxsI2CqQRnE3gkkUbcYH7cdG8rlarOS5DKVGs29QO3/+e8I 6NLgjaU8R4oxdvAE9yA5ySR6GAYooP60kjF9cF2JJ+WKMqN4tNShR4tOD0AdpwpoULBmge lwuvfdFMCYZE1ZzjTGDA43MxKFKFJx3PVSsO42exz0dtgveUV1uu1KaeuWFIe1Htxtc2SQ BpRODCXCzNugHn9J+meB50Ni9hneleA9Utd5MZ2tuaI/u6G5iZ6ybt+pU3SMmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738781071; a=rsa-sha256; cv=none; b=UlAhLb3v2OtqPxc2v+THod/EhF0G0oApU7dPiBLkvBdtXb3EV85TcAQ9+kvpmX0Sqk8CHK TFryOSqAhg2MwtsLlHf7yeW+FmA2p49IPXD05rsmj2tYYSRsWoqbkyX4Rv/fTu3HV9GedE 9RCppRdt8ylDtyh5QwQcTHwQp3Sv0CMPCwaJL5El1ft1jYWNVs5iAX+D2L7FTYehjYzGhU W+fWKiugsvkIcLMqkSqINjYSBfzMLyrq9x4pFkbCnOMz8VuuFjHnQ7pae4XPngzDwcmrt2 a2xzobd/7ZnYkppZNfNki5WV6ggPa82EiyZWvuhCtT7fMKjwUNgzWQpXKT1Lzw== 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 4Yp8KW4ngjz13Qy; Wed, 05 Feb 2025 18:44:31 +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 515IiVg6055306; Wed, 5 Feb 2025 18:44:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515IiVYv055303; Wed, 5 Feb 2025 18:44:31 GMT (envelope-from git) Date: Wed, 5 Feb 2025 18:44:31 GMT Message-Id: <202502051844.515IiVYv055303@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: 6b8b1047276e - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 6b8b1047276eb451b88711536e001fad6d3d9c57 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=6b8b1047276eb451b88711536e001fad6d3d9c57 commit 6b8b1047276eb451b88711536e001fad6d3d9c57 Author: Michael Tuexen AuthorDate: 2024-12-12 14:40:49 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 07:58:54 +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 (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 5ad1b2a664db..24a14c4d4879 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -1150,7 +1150,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 d6e47a29eede..138a7ce71bbc 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -2819,7 +2819,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); }