Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 13 Feb 2025 16:46:19 GMT
From:      Michael Tuexen <tuexen@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: a3b66c4bf0e2 - releng/13.5 - icmp: correct the assertion that checks limit + jitter
Message-ID:  <202502131646.51DGkJ62041737@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch releng/13.5 has been updated by tuexen:

URL: https://cgit.FreeBSD.org/src/commit/?id=a3b66c4bf0e2eec0f86cd4d291158575aef05dfc

commit a3b66c4bf0e2eec0f86cd4d291158575aef05dfc
Author:     Gleb Smirnoff <glebius@FreeBSD.org>
AuthorDate: 2024-04-08 23:54:19 +0000
Commit:     Michael Tuexen <tuexen@FreeBSD.org>
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);
 }



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202502131646.51DGkJ62041737>