From nobody Wed Jun 26 04:50:31 2024 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 4W88Qb5VMPz5P0K2; Wed, 26 Jun 2024 04:50:31 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W88Qb1QJnz57RT; Wed, 26 Jun 2024 04:50:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719377431; 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=V8Rl+bd0xm9GS90iKeLes7BB2pNJEYLpbwyquW8Ahx8=; b=kjywmZez9Ee+rERQbZVVoe1ywigU6IMI1UoWR/ktMhMiTQrlMe55IjoOXkkk/l6uI8N0JP adIQWzRylVs4AdvzGhiAmrttTrtlLqc4LsCDLMTth1CluDADAQM9VJpiLcKLhWqyO2fQZ+ jbQ4hiDs+oSdBOtQsFkjlUD+0BrJeVjj0qyMPlPdl16EDPM76g9TPk19kRY+Uatv4o5vi3 +7VXZkRepyBdGc7ecHPxUkTuCw0NDd0x/FUHjMf2BoztenqdmzRkgxhqJsOCJoqyrsox1u Lb2E8TJ+QSmr9QvGkVQsYg51OMClG6dIq1LlVyeFu3eNu9vyAUuTcI0WJAoTyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719377431; a=rsa-sha256; cv=none; b=wNZsSlA/O7TEN/vUWfz/Vc8GOmWr69dhY5blRlIVkil0moScLMZJLEdlM1V9IuduKdB0Th 2fswHXxg5AdND3W6R/MVtiIaAlOKEYTPJzxsHItDAHCCPdyQob5BzXNOsDUiCa7qCyhe5P tC6fzft45XpE+L3oZ9yhb24NSgSiZFq4/IT+iDLJnVoLrnQuqX/LysgOD5ZcYdyWipb6AS L44bm8BY0MghA8hZKdsPL/iZJtTjrDRxikL0AWyOZ9J3X2zhczC4hWvG7oEWMo/i1HdatW ZhRlNV2YkgC2ZfuN+cSlec+3/hAuveQDAmJ437K0uuPpldLtYPzcrqoBrBYN5w== 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=1719377431; 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=V8Rl+bd0xm9GS90iKeLes7BB2pNJEYLpbwyquW8Ahx8=; b=QpDwoVHUe/fHj0o1qnKeQhMztOVTEpABodw9uwxR/eSfGysv/v1LnbF1kGomVn4nhOugzd l4U552MbQB2Zmv6nctjEXEmYbbvxdNYfTZyGHV4vxbB0F+1i28vkqwN6N0sHOICB0l+02J 9XUDUNfIPLDo9f+ZFnlNfeKoLZBKy/0rE3QMfLB1COXGT5eaZLe2qNVCgjr7eRvyFM8gLp jdFcT4HmdJPwrMx472L2lF7RRTMA73tuRktEl99NtwM2wtIH7Zv5F9N6G1YGGmuNaJT1Qh DGx2tTHZCnARO9KR3l0au4lBw6MxDJkdsrwcW5H0G8B431Gj28jkelEkdamZdw== 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 4W88Qb0vGQzX6C; Wed, 26 Jun 2024 04:50:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45Q4oVef064106; Wed, 26 Jun 2024 04:50:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45Q4oVvE064103; Wed, 26 Jun 2024 04:50:31 GMT (envelope-from git) Date: Wed, 26 Jun 2024 04:50:31 GMT Message-Id: <202406260450.45Q4oVvE064103@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang <zlei@FreeBSD.org> Subject: git: 2472e352d80f - stable/14 - icmp: correct the assertion that checks limit + jitter List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2472e352d80fcf6440fd42fbb16960cc49d05b03 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=2472e352d80fcf6440fd42fbb16960cc49d05b03 commit 2472e352d80fcf6440fd42fbb16960cc49d05b03 Author: Gleb Smirnoff <glebius@FreeBSD.org> AuthorDate: 2024-04-08 23:54:19 +0000 Commit: Zhenlei Huang <zlei@FreeBSD.org> CommitDate: 2024-06-26 04:48:45 +0000 icmp: correct the assertion that checks limit + jitter Fixes: 4399e055ea610cdefa1470ad1ee614dd81ba5e56 (cherry picked from commit f7c4d12bcd5bd7f7fbf6bf9fa601c47e7f97bc5f) --- 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 67fb56dcdfa2..5ad1b2a664db 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 + V_icmplim_curr_jitter >= 0); return (error); } diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index c03c90e566c3..d6e47a29eede 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 + V_icmp6lim_curr_jitter >= 0); return (error); }