From nobody Thu Feb 13 16:46:18 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 4Yv1KQ6mJjz5myVM; Thu, 13 Feb 2025 16:46:18 +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 4Yv1KQ2rnQz3N39; Thu, 13 Feb 2025 16:46:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739465178; 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=U/pqebPmElG6UolQNnEaq1M4XZz5+VRDJ2VTZvHdNKk=; b=IiaEeT1f5tmUPl5+iTQ8JeYfADpFee9GofvwisBrIhK99+NAyHP8oebaSVF8GWfa8zIdRh WhYe10n9c3YFvEXj2TeMWLwMdOHc1M8KfiEBs8sxuzFzyICQEs9gRhA+UYFDj8BvYFs2XU ziIUZgBvS1ggthzV89N+NhwuYBxwHEFe25XCrJujJ+yTjE9mEpn1LWFofthVFRXZZumepZ xwqeuEQYemuehd/0NSLRmBXzxjS49cXcoUzPyAsZ9+i9xlSorld9ZqoGSHDxHG0vXJ7ucV WQ9ExfDJzn0M0sQSzEgEhw1jd+HN1kQkfoD6ix0KOh4cZJcrac2CPqjWaGWKSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739465178; 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=U/pqebPmElG6UolQNnEaq1M4XZz5+VRDJ2VTZvHdNKk=; b=oNZQq8aTbCEybuIj1sBtnAIor81gkpaTbJP8CV6XmlpeCOhno/uUjcpVrSoX1TKd85LgYN 6/aG8U3nKK9e9zyJvLgodURMJ38odZfNlGVvo8lZiMPKh50BqjnhJRvD+R2XQI//VEuO5e QdEoz89n8C6AGLdnNr6MT4jR1OPJATBSv8N42pRC8U13epubf01chHHugTEZnqpX1puaor 5w2sQDRUo6klFOjKh4ePqmQGSbyW6Z1Uo/lkm9a7jK8bYIDfUGq7qHCqf2jvOvq6gxbG8F PW8NmJhHPftzSv0TTh+koEgxvGf/CjXBeQjIn8D+xExOsawyJlNMcJLOIydHNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739465178; a=rsa-sha256; cv=none; b=VAwIBnWg4GsCNdSWgEfuUeYQnxyDwV6aB0l0AEOTp3gGdqiCvYNO0V+zghFN+hV+Oun1Tx AJrxWoyDvVpa8o/Dg5xpOhGwooJvpTv3GDzn4ffTNh9modg+i/nIXZQuAdM1kF63pptMxB rsv9oX8Ttp8SEC/dKTcoWmkiGtHhdc0f2H/HOX3vU13F15iS37J+i5iP9i5JrGViKlLOOP VxCn7m8zQMBF/0Cod+JR1M3OWSJh9RJQ5swPmmdIqMJy3yXog7OAAz7ynLEecST7ehsggB otL5bdFSztCgnEqwtBfB4vEAfqJj0ENtpUoVVuH4V+nmcU+HGhiXKhc3Ll3LVw== 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 4Yv1KQ2NTQztFP; Thu, 13 Feb 2025 16:46:18 +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 51DGkIAx041708; Thu, 13 Feb 2025 16:46:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51DGkIPk041705; Thu, 13 Feb 2025 16:46:18 GMT (envelope-from git) Date: Thu, 13 Feb 2025 16:46:18 GMT Message-Id: <202502131646.51DGkIPk041705@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: 881ba70c1a3c - releng/13.5 - icmp: allow zero value for ICMP limits 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: 881ba70c1a3c0c13fcc95291a22530b096803397 Auto-Submitted: auto-generated The branch releng/13.5 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=881ba70c1a3c0c13fcc95291a22530b096803397 commit 881ba70c1a3c0c13fcc95291a22530b096803397 Author: Gleb Smirnoff AuthorDate: 2024-03-25 02:52:03 +0000 Commit: Michael Tuexen CommitDate: 2025-02-13 14:02:12 +0000 icmp: allow zero value for ICMP limits Zero means limit is disabled, so the value doesn't need to be checked against jitter value. Fixes: ac44739fd834f51cacb26485a4140fd482e20150 Fixes: a03aff88a14448c3084a0384082ec996d7213897 Approved by: re (cperciva) (cherry picked from commit 4399e055ea610cdefa1470ad1ee614dd81ba5e56) (cherry picked from commit 0b29ef1e3fd57940704dd40a834f98649adbe46e) --- 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 0d671033b67c..8ad6191f3097 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -1129,7 +1129,7 @@ sysctl_icmplim_and_jitter(SYSCTL_HANDLER_ARGS) error = sysctl_handle_int(oidp, &new, 0, req); if (error == 0 && req->newptr) { if (lim) { - if (new <= V_icmplim_jitter) + if (new != 0 && new <= V_icmplim_jitter) error = EINVAL; else V_icmplim = new; diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index e1b0196fc62b..646c73e8abf0 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -2843,7 +2843,7 @@ sysctl_icmp6lim_and_jitter(SYSCTL_HANDLER_ARGS) error = sysctl_handle_int(oidp, &new, 0, req); if (error == 0 && req->newptr) { if (lim) { - if (new <= V_icmp6lim_jitter) + if (new != 0 && new <= V_icmp6lim_jitter) error = EINVAL; else V_icmp6errppslim = new;