From nobody Thu Feb 13 16:46:19 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 4Yv1KS5qXpz5myVN; Thu, 13 Feb 2025 16:46:20 +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 4Yv1KR5h2Sz3NVq; Thu, 13 Feb 2025 16:46:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739465179; 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=CGXjiGNcblNuSj5JtLaZdYw0AeOHLCzU+b07YqCfmJA=; b=TeL5GOwJmCKiu/AGKNscpvNoqAhmC3VfeLJJP/ImHJEWHZkWz0bWu3BQNWf+UfWAxikQ1g Gi5kOc1JMqbPPcHbFz3JPBjDU0kTZXTqETPiVJCalXzAaqQm/NQmiSeCXpQP+6B+BtGjJQ 0afdjfW1SzUcWDbpj5Do+Hj89utm6t67uGeiAniYOSoA9CrphZX/ZgWpoq2HG+i1+TJVik r/pKucNqN9vuNIPM0lm8yP1PpxoBIxlmctQrI/TUsjYohgHjQl9D9/icvqVCOfUX22glSJ bCRsrD+0hLkAgzmYpV2SGeNYda80+e4HUpA9OlqwP/KOZPlOBgmtcB2Glba73w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739465179; 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=CGXjiGNcblNuSj5JtLaZdYw0AeOHLCzU+b07YqCfmJA=; b=ai6YPdM1REtBHH20rUrJ4zYxU7MyG9Krh5lial7p7GeH3/yDsO4LgooufZKXhmnZqHLIpk nHyh4IGTQ+/dkWTTtq4qrQPbMGVg4vOQrXU9F2+yeCG+rbh1p8deoXUHlkkKsaXtVdIQkh vKBVlbqA3xCX/gxkYR9lBDr5lu4X8QPAvkv9C/jrhpxVbB2NN92bgS4dwWlEGy5b7sxYhZ w2ckIAyfmgpVRg6v03zS6uHF8byR3RJ9ZzMf/vNFEgqOqU2cffqO8qsvMfSoPMvy0kOoZ1 iHLPEEu+4aDJ3lukyDk2y+sOX7WPFg19jaa4l3JTMivrPDOfEmjUAq+J3eWGkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739465179; a=rsa-sha256; cv=none; b=ZYQKKDdQd9kEdWA4xJdcr0J9syJ1cKSlcChLbgOG7QUMaFI3FW076mUArpk2h1U5wT+fpe oma0dkF3YyHsBCGN17H3JkDY2UUpPsjOJvQLhKdDpiQ4khqZgcSQ6/wNEhsnAuAat7sy4x yTNQvawSDjup4fRECLX9T8SGYJ69o/zH4rs+gnP+TevQByjWHGrnFQgVYTPXRmfz3ozMMZ JO3gzwUi8ILAbAOzMrdOiMwX2theroP+WH2hA/6TB+Ym+QoES7MdSxBLTxgU1sJmB659v1 M9rikHa8kzRf6JIQuUDlW3QhPzF5wzwOWgZO9jqR/36bKMZaTJfhBspQh8jjcw== 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 4Yv1KR37pCztJ5; Thu, 13 Feb 2025 16:46:19 +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 51DGkJWn041740; Thu, 13 Feb 2025 16:46:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51DGkJ62041737; Thu, 13 Feb 2025 16:46:19 GMT (envelope-from git) Date: Thu, 13 Feb 2025 16:46:19 GMT Message-Id: <202502131646.51DGkJ62041737@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: a3b66c4bf0e2 - releng/13.5 - icmp: correct the assertion that checks limit + jitter 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/releng/13.5 X-Git-Reftype: branch X-Git-Commit: a3b66c4bf0e2eec0f86cd4d291158575aef05dfc Auto-Submitted: auto-generated The branch releng/13.5 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=a3b66c4bf0e2eec0f86cd4d291158575aef05dfc commit a3b66c4bf0e2eec0f86cd4d291158575aef05dfc Author: Gleb Smirnoff AuthorDate: 2024-04-08 23:54:19 +0000 Commit: Michael Tuexen CommitDate: 2025-02-13 14:03:13 +0000 icmp: correct the assertion that checks limit + jitter Fixes: 4399e055ea610cdefa1470ad1ee614dd81ba5e56 Approved by: re (cperciva) (cherry picked from commit f7c4d12bcd5bd7f7fbf6bf9fa601c47e7f97bc5f) (cherry picked from commit 1b4561cf4b46ffbbd8851aa40bd0402a6bba8906) --- 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 8ad6191f3097..67adc1245b60 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 + V_icmplim_curr_jitter >= 0); return (error); } diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index 646c73e8abf0..a26348640cbc 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 + V_icmp6lim_curr_jitter >= 0); return (error); }