From nobody Thu Feb 13 16:46:14 2025 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 4Yv1KM2KcNz5myct; Thu, 13 Feb 2025 16:46:15 +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 4Yv1KL73P7z3Mlh; Thu, 13 Feb 2025 16:46:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739465175; 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=3TjNM0nDZxQfShUs96qL+U4Tji9Ma4Sd4C4LfjupBBo=; b=rpW3aW7NzDWtsn0kUlGOgbeeZ7v+fHYhdQs/1gzvBLGmBJ3zohdYqeGBkJWqUsZqPH/CPC Ylohh1rwbhoxbr5k3jEjfE9FFLDA0g0NU81woe9hgwje5cO0XqXkmH+WNEEkNwRt/JZUgO tG9CL8NicHxGNxnAUTO8Mg5x/6VkeYMIgOmF7dOkMPLdSeMg6mEjc1MpsQlhE9A5IFIhoz K6h74LXV8XXaqdcCwjEGpn1yzzC5zJqhwG35CoHChfpF/GB/Mkyj5Lqpc62KLnvtVvB4Rr cPTteMmdQIKZGnlX9YsO8BsOZkcl4GnKyQf7+vWPwp2ZDIGnadKosic8cd0FZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739465175; 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=3TjNM0nDZxQfShUs96qL+U4Tji9Ma4Sd4C4LfjupBBo=; b=cXRyHMqYKJxbjEw0wgJSbTmUzieB5wivaynaeBJeZr87b3wkNxG7L7yYu+tFY7XKz8c653 JY1rh6ne5HYZuDjTrVUI2xcnJ7u1R/TuhPaq3+LO4e6ZDfWTLjambDQI8K3ga0vMZhdCp3 QhneI4jBFING+7in6p6mSKR3OWd93x9Df/kd+i5/lizK9JUR56pOZOtk8Ufd/j2AbdOleG JZIZKCArPjkbwGxx+vvnIdmh56P40hCNJW2A/DOMwxHdZhEiIgQ5LIsq5H3q/CVtpd3EyI cneuRwXHXXb52CcMCv86NrB1P3GWGAY7GA/egYCIuAKXFuZRM/oR6PdjY/usxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739465175; a=rsa-sha256; cv=none; b=etNTQrt2H+K/2n6EJVCy3jPEUkVhfNShpIKgEbB0FkkhhbW+zrXkVXJBUbYCgEppAqlTXq Z71XSyeFr/jEZkjlzSUIfMdQzqhbc3HQPVUkQcD9tUjnUjTays387fVzPaRosSBEPBA6l8 pME0kZWOdbmKAR67JlZeg8y8TyAyXMN+xVMCYaGLU8Tzta8ZzWtdcfxbKpFkBHn5toyehx YHcOWMYGpt66hwHZr5HqvPqk+642gQRGZ+TXibxoqLHc2PDAUL1wBzyjYdo2d2/F9/7SNE JmS54eOw0KT6NZ2OdMeOMfmEkUarKUT4GedbEKKsDcndBibF9dcoxvsJtoXyiA== 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 4Yv1KL6W0NztTn; Thu, 13 Feb 2025 16:46:14 +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 51DGkE4a041612; Thu, 13 Feb 2025 16:46:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51DGkELN041609; Thu, 13 Feb 2025 16:46:14 GMT (envelope-from git) Date: Thu, 13 Feb 2025 16:46:14 GMT Message-Id: <202502131646.51DGkELN041609@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: 9880ce076584 - releng/13.5 - icmp6: make icmp6_ratelimit() responsible to update the stats counter 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 9880ce076584d4ca3a14fb87222cbb387be0d108 Auto-Submitted: auto-generated The branch releng/13.5 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=9880ce076584d4ca3a14fb87222cbb387be0d108 commit 9880ce076584d4ca3a14fb87222cbb387be0d108 Author: Gleb Smirnoff AuthorDate: 2024-03-24 16:13:23 +0000 Commit: Michael Tuexen CommitDate: 2025-02-13 14:00:23 +0000 icmp6: make icmp6_ratelimit() responsible to update the stats counter Reviewed by: tuexen Differential Revision: https://reviews.freebsd.org/D44479 Approved by: re (cperciva) (cherry picked from commit c6c96aaba8dd74eb39469ed156ff19cc31d599b7) (cherry picked from commit dc167e64dce3ffc212e4f7a2268587abcc22c036) --- sys/netinet6/icmp6.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index d49c3856be1a..258f4bed794e 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -346,10 +346,8 @@ icmp6_error(struct mbuf *m, int type, int code, int param) } /* Finally, do rate limitation check. */ - if (icmp6_ratelimit(&oip6->ip6_src, type, code)) { - ICMP6STAT_INC(icp6s_toofreq); + if (icmp6_ratelimit(&oip6->ip6_src, type, code)) goto freeit; - } /* * OK, ICMP6 can be generated. @@ -2799,6 +2797,7 @@ icmp6_ratelimit(const struct in6_addr *dst, const int type, V_icmp6errppslim)) { /* The packet is subject to rate limit */ ret++; + ICMP6STAT_INC(icp6s_toofreq); } return ret;