From nobody Thu Feb 13 16:46:15 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 4Yv1KP0Rkyz5mycv; Thu, 13 Feb 2025 16:46:17 +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 4Yv1KN2Pxqz3NFH; Thu, 13 Feb 2025 16:46:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739465176; 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=yhzlA0k1mDzCD9jiAp0+QXNAuc8F+CWIeN37fRXSvwA=; b=sas8fABGhb8VSC9AcZjUWM5T2J9IenWBkoMBf520MYXUgeVJKv6OzfCgVOjOW3vYqjAh5K K8dq4+jW/kLw0TM/+fCWg2asHofN0W12MJUwP7dxcw6qBgVxUWmacjle2pFW8v/SA0dyl7 agJVdvEELkJoislZUCG15ba0jH2HWoAnfmTO4y9rjY/Y68w7GKgTwxq8UIPU0zH+BdLmG7 sB/lRiruD9IFneoDoPUgGRVeyB2znFtV4YtxXdbCFXRQyRGUIkFp7Fq5zkKZVgXxa69E+3 KVEDneeP0sS2ba7F/gJqS20M5BfLunG2Ssymq4X8XMOxtXBuAknSCjcKqO296Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739465176; 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=yhzlA0k1mDzCD9jiAp0+QXNAuc8F+CWIeN37fRXSvwA=; b=nkgcwXEA0f5TR+VNNkZnvqaFDx3yF5s/814lgHbvVkqpFWHjgxOcsIRFeKGHxY2TDNeKCl c6qX3hqsDc1DOKLkSoWFdSov6toHEoanxVVFjd/h5nbOzvY51QBaCQWlwBWM/kCQBWOjqh ZKOeviwb+4BLtO96FB/jnQLVQiccWFcSgTxnvqj22St7dLRRkQZNConxN9Plo0m20WuqUH x+H9qJ3NQr/Wl48cyjvi0vu0NuExl48vqg2IYJRkdPpetLmcqvjOMsQUuZOomqT/qpOmqx LXhacWqFJUvquwYx22CbRuOiHd1uHwqv0xfFy2j/qV7PwgSytD67gtsZao+Lkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739465176; a=rsa-sha256; cv=none; b=nKASL+7y6OcFJvJ6uOFBOvv6nuE6P60APxZHaOp4eC1rrsZCCKZ/TZaEvmyjxIwArasfD7 5JxkD93K2xih27nszPdRRwWmHXOVKkBx4dZFIDrn0WdxFhareA3bXrXhHXi1p/dKONkigV Kl31e1dMkTFUwwYPtnpXkW025zWwDHfqtzlBEvwCAqszh5GObH7vd2bqM3XaUIhUsH4aG/ Oh4RfRbLTgACLOLQ0MO5HhcTVl+vzLh8JTN3t26WE25i/a931ZOozcjvs7/MoeaWFUFFmu v80B43wjD9dRD4XAWEOqJtAfXaK/9bZSb50t1PeAv9MqXAL/2z6wMhWR8w/n1g== 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 4Yv1KN0N8xztFN; Thu, 13 Feb 2025 16:46:16 +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 51DGkFwk041644; Thu, 13 Feb 2025 16:46:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51DGkFlV041641; Thu, 13 Feb 2025 16:46:15 GMT (envelope-from git) Date: Thu, 13 Feb 2025 16:46:15 GMT Message-Id: <202502131646.51DGkFlV041641@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: a7ad6437193a - releng/13.5 - icmp6: rate limit our echo replies 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: a7ad6437193a563c60a52af3845649671f59a16b Auto-Submitted: auto-generated The branch releng/13.5 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=a7ad6437193a563c60a52af3845649671f59a16b commit a7ad6437193a563c60a52af3845649671f59a16b Author: Gleb Smirnoff AuthorDate: 2024-03-24 16:13:23 +0000 Commit: Michael Tuexen CommitDate: 2025-02-13 14:00:57 +0000 icmp6: rate limit our echo replies The generation of ICMP6_ECHO_REPLY bypasses icmp6_error(), thus rate limit was not applied. Reviewed by: tuexen, zlei Differential Revision: https://reviews.freebsd.org/D44480 Approved by: re (cperciva) (cherry picked from commit 32aeee8ce7e72738fff236ccd5629d55035458f8) (cherry picked from commit 90ecc3fc679d1df50772327d80e0d28f59e584af) --- sys/netinet6/icmp6.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index 258f4bed794e..09cb893b57fe 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -536,6 +536,8 @@ icmp6_input(struct mbuf **mp, int *offp, int proto) icmp6_ifstat_inc(ifp, ifs6_in_echo); if (code != 0) goto badcode; + if (icmp6_ratelimit(&ip6->ip6_src, ICMP6_ECHO_REPLY, 0)) + break; if ((n = m_copym(m, 0, M_COPYALL, M_NOWAIT)) == NULL) { /* Give up remote */ break;