From nobody Sun Mar 02 15:02:43 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 4Z5QD32xL7z5pTvL; Sun, 02 Mar 2025 15:02:43 +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 4Z5QD31hNwz3TTC; Sun, 02 Mar 2025 15:02:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740927763; 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=Sdlodn3S9br/PEzssoJF+S7EvmvHwmu5590QGHwh00g=; b=yQNy4BqWaeM7+jVsg1zsTz0FMaaGZT+y7KYrd0dE0AScjAAfiOETKL9o8OzMbtxWFyjcg5 VPCl/9EJzYXz98gDqOKwH3PS/ATNvIBwLx8goVxlJ/jyTm2Q2J4JHRmqIyK7N4VI1KEx9b vIwOoi5eA8akoJNMB5YV5lTJhI4kzGn46ieBapb6MRCxxAns0yHGQ0242fG0ov/REHENsy 2J5A5rmRAtul/TP8YsEc0WAdNCm1CoNEahfWgxd6dCyBB1eP+sTC+9Bk05I/wuN+sKaDfP 2u/7EYIaIU6wS8VPTHsUHqciBtZdGnFQcO+r9Kj0FhsM+I2Tyq5KQPdQZkOz0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740927763; a=rsa-sha256; cv=none; b=WF3gnZbcnYKfUJDTlh4EhlGMOB54gE79thgHM3FV8zrZu+hPF84qbRr9o+JlfCBo1HHox/ bPQ/P4DdDnDoWlPgGWat0DgwZDAZvA41xSRsGCKkCOMysEfWRh5/3arhsWnQ96MutnjICf rUsWVn5G8jMRspMJMjBSy9Kp3IPYibqZ0lDGjF+jkwADYqjM0N+IiX7sZriAqQVfHf59iz UKNm/8dvUqSnSsdN5/4Al9icRrGKxcBRy+1Z3IaDPq7KJD1iaczWFGRkvYt0aP3Ul0pyWd r2KBdqSUc1TzXhuWsypIh4MKKa6z3SJd5EcJbBhcoHINFxgICWzZWcO1T9z4ZA== 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=1740927763; 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=Sdlodn3S9br/PEzssoJF+S7EvmvHwmu5590QGHwh00g=; b=BA5ql0UXCKgiAB0RwLhoLTqrIz1qrPp92AqmhIXu4sqOjx59yxea5VgebO3PN/q4B0EPqu aNrsxRPE+jaDgvDhpj/yhtQSQhg/VPWqixKInLStqO9UC7iEdcqxPPzH5W/WKqV3TlQcUD z3DJbj2yFwH5KbJ3Jz1niRB5YKX8Nk7WBnpx2tA8/rTG39rPzUzdNawxyKxbgoMy6aTtGJ Nh/Zabnf7fRRN0EDNJOHIZSbE7gEvF1kbC1So2xVLs2pjQStwX6HoOODSHrQgsAE1AN3HP mlej2UgWDyZmbx6LWYoJarCH6GqzF1FAKo199V1BTWguXNYsal7MrdkjWP8Ujw== 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 4Z5QD31HZ9z1644; Sun, 02 Mar 2025 15:02:43 +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 522F2hLQ089753; Sun, 2 Mar 2025 15:02:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 522F2hCi089750; Sun, 2 Mar 2025 15:02:43 GMT (envelope-from git) Date: Sun, 2 Mar 2025 15:02:43 GMT Message-Id: <202503021502.522F2hCi089750@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: f7174eb2b4c4 - main - netinet: Do not forward or ICMP response to INADDR_ANY 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f7174eb2b4c45573bb9e836edad2b179a445a88f Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=f7174eb2b4c45573bb9e836edad2b179a445a88f commit f7174eb2b4c45573bb9e836edad2b179a445a88f Author: Zhenlei Huang AuthorDate: 2025-03-02 15:00:42 +0000 Commit: Zhenlei Huang CommitDate: 2025-03-02 15:00:42 +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 --- 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 9a644c60e541..22adc8277b93 100644 --- a/sys/netinet/in.c +++ b/sys/netinet/in.c @@ -276,7 +276,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 936f76e7fbe3..17d15d7d9629 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -783,10 +783,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;