From nobody Wed Feb 12 14:04:38 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 4YtKnL71Qdz5mr05; Wed, 12 Feb 2025 14:04:38 +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 4YtKnL6JGsz3wMC; Wed, 12 Feb 2025 14:04:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739369078; 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=MoBZMP4N/2zX8l/q0YS7FDe3vTor5sE6xkARFrhssOw=; b=VPerrOkcybfEVP8/m9cM/xZM7qXJ6ynoECc+LBCap6rUrJ564H1l4iw4qp5TQg5oA/C7Qq V3LwkFt0KE1HLMXQ4uSmHq8Y0F/ceCwhDzxeb5mFqRtmnx2neTU44zt1K2tAkETOEUzDDn AemZbJzH7836leSFluWNU8LpLDJw/Hfv3A8zenk00wW7oVlI7WYF2U9nY+uVOji27RvYBG 5v1JXv2TCo0Fp2ezdQ8X9Xf/kBRnR6tBAhs4bFooplQgDXucBQsU7FP2TyaIkStduMfouX rQqf/6E5fTmlk7a0JzSZOghm3K9/zAp3kKgqBBoTAeddJrLMwa4fuSwEA7YiNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739369078; 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=MoBZMP4N/2zX8l/q0YS7FDe3vTor5sE6xkARFrhssOw=; b=Rtosax2hiKc3KWBaMPqcUlJpf/QzhDYoZ4ubdcTKg6WKx1a9Miu/FtbEEOMNr1gz0HTIgO 7gEkqa18VFxtuzXZkQvpr5/KrF4OrrGQCOrfjPOXJOuFG7dnx8CZxg3LXM5jZKhKDiWuhE KC9sSGlwPiVs/XxLWtK7ABKPFM9vVssfqBqiwAq2PQQBcbycNYkdocnJPtEWoPfG52NtnQ Hhalg8OsUgftMK+YgS2EEWTVW9cFV2IkKz5wpHeSfnpzS0FVO1+E8O4mBWzgTxLASxVere Z88HGmCsuRoTfBUavZ8Mpf3yppLNvcoGkz4xuScYmp6yNnGK1RmRc+sbzhFI9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739369078; a=rsa-sha256; cv=none; b=VdqN50NPT2IfkfHdnosEdyYHi59qImJJvIuOYtyMy2HsTozvnCpya/mR/Nz3XvWFXBgKlV yNRAZollGfRO3VmZY8OG8Kj+UHTwJEMVevuROKRtLhyB9jyJQcpqPsR8VngsaSdlBZCMU4 OMXRHvanmvzerwD0XxNa7n4pCDc3nwPgyTVCmDiBOrgRyOGDJYFrI2qXsl2mUeFeQ63yXb SX5PWP4XCqZhP3IiZ+N/ygjVAvVtgNwaHyNQMe2HjcR4NFxEOTgz1iNRUCHbEGPXtyKRU9 /eBZBwqKSZBhoB0JiJBp4zZXiH93+Xq9Eqfwartc5/GG22v9VPSPn9er4SPyXw== 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 4YtKnL5dq9z11s7; Wed, 12 Feb 2025 14:04:38 +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 51CE4cLU042157; Wed, 12 Feb 2025 14:04:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51CE4cf7042154; Wed, 12 Feb 2025 14:04:38 GMT (envelope-from git) Date: Wed, 12 Feb 2025 14:04:38 GMT Message-Id: <202502121404.51CE4cf7042154@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: 0b29ef1e3fd5 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 0b29ef1e3fd57940704dd40a834f98649adbe46e Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=0b29ef1e3fd57940704dd40a834f98649adbe46e commit 0b29ef1e3fd57940704dd40a834f98649adbe46e Author: Gleb Smirnoff AuthorDate: 2024-03-25 02:52:03 +0000 Commit: Michael Tuexen CommitDate: 2025-02-12 14:03:22 +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 (cherry picked from commit 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 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;