From nobody Tue Apr 09 00:03:55 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 4VD5lv4jvbz5G6sg; Tue, 9 Apr 2024 00:03:55 +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 4VD5lv4CZWz4Yvv; Tue, 9 Apr 2024 00:03:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712621035; 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=/Vmv2fRoXX3bFDmBG0wu2/YYQa0kem6PxbJQhrnRzsg=; b=jFXMjyacwEu2r4YOEkC2k+pR5OrlVdHVVRpjVDidMCa70ir6RviiUAIdI28UNEHrU4hJ9P YeTPKw4OAvi/JDNbHWtJlIM+7Io3j4XCz0VDDBe0vpudZyO43LKhhbo1aAFTVCl3rG4fGY IlXnmZX/NRIj53Kw+oBVj+OQjliSewpfa7WjZQwEXe3gSQGur85qfy40n1cGm7taU7MTQk iSI28+Pk5pptPrQsHGASrcWoMC1Q5ZMpTF0oUDEFPH7MCJE7GGnE1XsSC/s2KWFIQ8P9eK EGKhaVCm4ffum3F6C8+M+RQBpyl2kKvOOh0KVxFPKbHFLRE4hpI+PLSAtap1fQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712621035; a=rsa-sha256; cv=none; b=hHiTT6vZw/EooNdWVjKXTr5whwLoF4LeYovH7f/r8haB3uEvBv4/jnEHfyTGUEwI67qLdZ vEAUaPP5M3zZcm9atHypS/3dGhMTfrH/jkdTG7+rxSv96vWua9KCyiVQI7dZWlMbRoNPyd yMNXsUef6yW4Apydru0vhz/CdAgGKtozusQlheSmhHQbJHqXcRKAupVFgyx4UegyrFREFB JBcwJ+0YA1zBXRBAD98Wx7DTRgU/VR34cBMTDRK5Y7ofcoCxbJLEhWFg7EpXqsX8W++JIQ j/gGLbf/X9SbiqTyhnkPk3FIl7axusXoNgS5F6tIr4pFNylE0PNkEnJf4fdgIA== 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=1712621035; 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=/Vmv2fRoXX3bFDmBG0wu2/YYQa0kem6PxbJQhrnRzsg=; b=eWCX7ypd9eS9HC8jsi2xzZgNH2LvcUWPL1gklNIAeeKS2Tl9mV4ZdTJpALxWnUer/T6YWR xzp3wVFCu8m7TJLc7vhMLPRUGxWN28+AF3wZOaw2JPfyD9j+8C5VI/exD30Wzy9T1oglzR XApQW95Pr54KFxu5LqEpb3Llboa7UbV+8kM7O+NqYFBDVrnSasxOInr5jOHclgegG0pHIS gYOjCLEdii1f9dkkdoF8+7pvm2khoe7WvzxVY0TQI12gRS3E+eCQ+8nwZ41XcULgiS/OYl VpPbRV3M13eCx1H9tF64It0iUoU6W246Twt9R3sUYR3xg2MmR0IfZpHuek0mug== 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 4VD5lv3m4NzXSF; Tue, 9 Apr 2024 00:03:55 +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 43903tZ1014842; Tue, 9 Apr 2024 00:03:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43903tVC014839; Tue, 9 Apr 2024 00:03:55 GMT (envelope-from git) Date: Tue, 9 Apr 2024 00:03:55 GMT Message-Id: <202404090003.43903tVC014839@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: f7c4d12bcd5b - main - icmp: correct the assertion that checks limit + jitter 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f7c4d12bcd5bd7f7fbf6bf9fa601c47e7f97bc5f Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=f7c4d12bcd5bd7f7fbf6bf9fa601c47e7f97bc5f commit f7c4d12bcd5bd7f7fbf6bf9fa601c47e7f97bc5f Author: Gleb Smirnoff AuthorDate: 2024-04-08 23:54:19 +0000 Commit: Gleb Smirnoff CommitDate: 2024-04-08 23:54:19 +0000 icmp: correct the assertion that checks limit + jitter Fixes: 4399e055ea610cdefa1470ad1ee614dd81ba5e56 --- 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 a8ce2b4c1d6c..1149796c0db3 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -1148,7 +1148,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 b4473a40be6a..c5e3334eca67 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -2817,7 +2817,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); }