From nobody Wed Feb 12 14:05:36 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 4YtKpS4pD2z5mqr1; Wed, 12 Feb 2025 14:05:36 +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 4YtKpS40hgz3wJ7; Wed, 12 Feb 2025 14:05:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739369136; 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=BZhLmNPOaRUV98hy4pIDAxi5uV3jptQdnTfNbRybPWU=; b=a+aQUZATGedPrEETGSPZbYIFF37lA30lMgWfqvMFFIzbY8XG+gKDasOWPsWXW+/OmrK8Sn 1XN1zTfcso0astBFFDzwb6K+UZ5d5haoEg1nTeSiJvrbobrtWoN0RK6HFmCDypH64kTqiC bo6UYp0jbGNfpeIr88nLIG3AaaWxcdigM2/31ADtgUBljTreCZNLnADLUT2TCt3Zg8QRoG IjpXUekCVRWNLce/sx2qENXPJVzzDRpeivPEFbkJ4qtluApjYFx5Nmb+DjNsXagS4S+0+A o+ik1yO1Gg+oYUIGGh5fdzX3Dedkf2FxobbayHS+g5M9fKzvtXruAL74ppvSjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739369136; 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=BZhLmNPOaRUV98hy4pIDAxi5uV3jptQdnTfNbRybPWU=; b=p58GWKx7iMlZlXfooTprFEjFEZhWTY5eOAHQI8BJCPDZWhXBhiYnEmU7JVnQMgGDB/TLfC RrohP32ktkPrtTnkTwKmIHiClQR/dvI02TdI9WgCZuyieDXJCmEUyw0uLgJwbDNtDaue0z UngX5dLNKQUOVlIyGbhDFZQrseFXE1Sq1u9506oPzFpCQAsh/HloXox9TO4AhwXQOSsiBC XDdjs0qYypObTBg2N/X6lXU6ORK3ljk+baTx4A+rsNosvN4K0uezSArjKxfaIYD3WJtp2n uJ/EERSXtFrzDZtv/dC+MH6XCxENgRwAt9JUb+YwWf2S7Iv3Y2AkEeRyfQRSgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739369136; a=rsa-sha256; cv=none; b=cz3iCU9oVhXPveQbuyfDVoM6cpDv9pJF2C+EZkvW0WQ6hRdmydBu8HLA1rGG0pDgmiZ9wM aGMINbid7VCqUKIVC23zLvh9bY7e/iVdu/3RnR3qqiMpJ0FZY7tG29fvfbLDP60TPFrK8n XC46BeV0VS3NqYllg1l43foCIhi7qoO4mRK4kqC0v0wHfmdjIsjhJcZdekj+deq+nBSB/y AWA/Hc6hfWSFLH+MgtG6TnDg1/ZKzghhR2Hzv37/v5FjrO3Z5eCqFYfD+erZbRHMXTEyfI /l5Lxm8VqNWBJUeQSMfTBWuqeLgfZUQ6wO78bNCs0Y/fcEv6SyfSOcLDtOwLAQ== 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 4YtKpS3Kz4z129g; Wed, 12 Feb 2025 14:05:36 +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 51CE5aD2042566; Wed, 12 Feb 2025 14:05:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51CE5ag2042563; Wed, 12 Feb 2025 14:05:36 GMT (envelope-from git) Date: Wed, 12 Feb 2025 14:05:36 GMT Message-Id: <202502121405.51CE5ag2042563@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: 1b4561cf4b46 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 1b4561cf4b46ffbbd8851aa40bd0402a6bba8906 Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=1b4561cf4b46ffbbd8851aa40bd0402a6bba8906 commit 1b4561cf4b46ffbbd8851aa40bd0402a6bba8906 Author: Gleb Smirnoff AuthorDate: 2024-04-08 23:54:19 +0000 Commit: Michael Tuexen CommitDate: 2025-02-12 14:05:14 +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 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); }