From nobody Fri Mar 07 04:03:21 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 4Z8CLx6R2hz5qbHD; Fri, 07 Mar 2025 04:03:21 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z8CLx55Qsz3xg0; Fri, 07 Mar 2025 04:03:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741320201; 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=1p4dOAJkaCuFZ9lP7lbJcMpehXmcfH8MX3WR48G+HwU=; b=V6RIfL1wpk4jL/7FH4Ex0RpyXQq+TWYEWT7wMHvrh9d7GJO8R5x4DFABeFLNOD9OXV09t/ KYbwJb0BEZ7jJ51Hnl5WR2+Ttx1WJQytyYcxw/x5rNR1FLgPNfH1fE5tnlTLdxxm/Y+3J5 rr+qOuLc1/68umv5Uwf++GpHiYn+Ho4k/7AQUmSEHciO6uoeweYcrHdYZKjQlQXvQAzfPP WXBkmbL32Z1pOZbOtmEPSkrX31mZEECkd5z92wkt9m73LQeIvogchTMk8pq/ZPg/aIqm8g N0csWulB6BHZmMT9qC21bUfegWQ0OwxUg2X4G8toaBvzvhqGs7CIwRZO1ajTJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741320201; a=rsa-sha256; cv=none; b=BUMIJSUHRTm4JZ6BZspr/69/9VUDaorpA6LttYbGV+Dk0MnipplAIhelIlgIYMkQgEjx57 TcPatjoMF9AkKwTHN3nWHkqfISnxl4ArkkA80m/6Go+0ymfo94a5x6VRS6WMbzHz5mj6sR jEkZYCPOEzWSZLX1jFDWvKTx+ZxTPTykQQXbwKpiJ1IQdza1NwCsTBP/3sTAdGK87HsHNN yK1fzDsf+Pa7kpuUPOtjlu0NEPyjfEBlE6ei12qzAhFP1mSnyoZVTkMjPySpXe6g5xAYdE r8P/IFAxNYLvSW5ong6+rsA6XRQQiyOREGShjqxpzN+eNOvMaGDnPWq9gAbtfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741320201; 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=1p4dOAJkaCuFZ9lP7lbJcMpehXmcfH8MX3WR48G+HwU=; b=WLuiqk4W1vz+ss4cJ4ZVFLTxfqDroYeO4DTwIFv6j6jBjEVvvgbjpMgMdFUW6RX7AveyXf nkQFK0LODnZP5L+BMWfakzJ2lW0eItRAlLqPBqVBo0iRuu0X7Hhy/xtDqz2goeKz/P9nuE owzCSk5lp4hTCWafWbZfDFWHPqhRbhObnAZq9IZ1BrKl67u5nFGcfXWeHUpmQAGwYbqsWI /6Tdjdq9gppOWmbyQRaXJLUZBDT8a3VZUEjrsQXY1oX3kRRmlgf9r21APJuvkKR4Yu74ZJ 3ohqbp4xd4XsOp6WlEWtZh6wevhDwNITi6bmjwk9fVVVEUAwYE04QMwRtwRm9w== 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 4Z8CLx44Yrz5g8; Fri, 07 Mar 2025 04:03:21 +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 52743Lxu030340; Fri, 7 Mar 2025 04:03:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52743LDS030337; Fri, 7 Mar 2025 04:03:21 GMT (envelope-from git) Date: Fri, 7 Mar 2025 04:03:21 GMT Message-Id: <202503070403.52743LDS030337@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 9406d7e32da7 - stable/14 - netinet: Do not forward or ICMP response to INADDR_ANY 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9406d7e32da718dce31e36190be308c61f87604e Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=9406d7e32da718dce31e36190be308c61f87604e commit 9406d7e32da718dce31e36190be308c61f87604e Author: Zhenlei Huang AuthorDate: 2025-03-02 15:00:42 +0000 Commit: Zhenlei Huang CommitDate: 2025-03-07 04:02:41 +0000 netinet: Do not forward or ICMP response to INADDR_ANY The section 4 in the draft proposal [1] explicitly states that 0.0.0.0, aka INADDR_ANY, retains its existing special meanings. [1] https://datatracker.ietf.org/doc/draft-schoen-intarea-unicast-0 Reviewed by: glebius Fixes: efe58855f3ea IPv4: experimental changes to allow net 0/8, 240/4, part of 127/8 MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D49157 (cherry picked from commit f7174eb2b4c45573bb9e836edad2b179a445a88f) --- sys/netinet/in.c | 3 ++- sys/netinet/ip_icmp.c | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/netinet/in.c b/sys/netinet/in.c index e30f63e5bec9..bb36ef18d3e2 100644 --- a/sys/netinet/in.c +++ b/sys/netinet/in.c @@ -278,7 +278,8 @@ in_canforward(struct in_addr in) { u_long i = ntohl(in.s_addr); - if (IN_MULTICAST(i) || IN_LINKLOCAL(i) || IN_LOOPBACK(i)) + if (IN_MULTICAST(i) || IN_LINKLOCAL(i) || IN_LOOPBACK(i) || + in_nullhost(in)) return (0); if (IN_EXPERIMENTAL(i) && !V_ip_allow_net240) return (0); diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index 26ee6e5c1245..122293a36a15 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -790,10 +790,11 @@ icmp_reflect(struct mbuf *m) if (IN_MULTICAST(ntohl(ip->ip_src.s_addr)) || (IN_EXPERIMENTAL(ntohl(ip->ip_src.s_addr)) && !V_ip_allow_net240) || - (IN_ZERONET(ntohl(ip->ip_src.s_addr)) && !V_ip_allow_net0) ) { + (IN_ZERONET(ntohl(ip->ip_src.s_addr)) && !V_ip_allow_net0) || + in_nullhost(ip->ip_src) ) { m_freem(m); /* Bad return address */ ICMPSTAT_INC(icps_badaddr); - goto done; /* Ip_output() will check for broadcast */ + goto done; /* ip_output() will check for broadcast */ } t = ip->ip_dst;