From nobody Tue Oct 04 03:57:34 2022 X-Original-To: dev-commits-src-main@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 4MhP6k367rz4dkyW; Tue, 4 Oct 2022 03:57:34 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MhP6k2cV8z3s69; Tue, 4 Oct 2022 03:57:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664855854; 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=REZggxmElPmHv69rYc1naoWEaLvA3gwxyr/Mi+levbM=; b=cYP47JHMbzAaLdPNd5Q7unBEIWTptNLgcNj3hO9eciB6+fkFloobB7QnhcfGzrFzWC/wGS d2TRihyV1piQEp46kK+hI9gzeZZyg3JK2GhXsLM3LNy2MCi/TBENEpf15WuKyhp95kT15f f5cwLUuT52PaQjoxglVzWvieJ1CdcgnFAXKX8wwwYU/wT9w5iIcQsg9RZ0qdO8veWmFyvW QvRP6bF7tePxqXKDsYOlQMWsEjvtFB1r6WsPjRFVHTnL4xTKO1BWjE+b5uCIKmTTW+KPMJ rjdIIXp/fiXSlUZ8g2HBo7aDYEYcGzqK+xBIRhRA/Z2LQ9JYXhtDb+nMLmQHUQ== 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 4MhP6k1khDzR71; Tue, 4 Oct 2022 03:57:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2943vYWH015355; Tue, 4 Oct 2022 03:57:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2943vYJ2015354; Tue, 4 Oct 2022 03:57:34 GMT (envelope-from git) Date: Tue, 4 Oct 2022 03:57:34 GMT Message-Id: <202210040357.2943vYJ2015354@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 7f3b00a87aff - main - netinet: filter out invalid ICMP responses in ip_icmp() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7f3b00a87aff787e93c3896279105510440627f8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664855854; 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=REZggxmElPmHv69rYc1naoWEaLvA3gwxyr/Mi+levbM=; b=ftlLMnd0mZk7/cM5n6lNtYHhehV8AdtuNjLzBg1C5A5CbMCo6IrSIJwHrNWjRlQbAjpjLr 8AcsN9aIEBk7lhsmDUkrQ7cLaYPkuwz7QO39A+CEhy8KT1klcU9EkF12Z2ISlChFjp6zx7 xL/fwwydBNZICmnY/uPYPgcclBK9nS8rlMH4ilH8QvsyoZx3Cw91JikrR4ZKeTJ+rSrglt Ul5anzPla64gVZUbes3PZP+dJvwaunfioNSbvRKWYHI2OZpTNZJOHcS8eLP+JZ7z3sIuur xhkxeVsEiLobeE0FezVLguv8klfC+YJH9uyAZ+DHJ0cNza1dJMYkqok7seEuXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664855854; a=rsa-sha256; cv=none; b=mPFVAMLsiDlns1YK63ZlcYSjXAEU4sUr5nTPcFrG/y9ztyRVc0d9UYhKESMTPsFjRV5ZLc TuUT32Gv2KkAwQnXtvDkra3eDoz+93STjb6q6Q4X9v+Lvt/envx0A2jALG+7ZhoKmC4du4 XcP4GP2S4xt2smIjj3xDRC/DpB7DvRUu9cVT1wgGlNyArrWF4xeGHqD19fPbNaKN13zC8a JUbdip4LV/+AW3DOe2EP2N1MGxHXezU3LRdGhPI45d8739AeUlWnhni1gTm/f7dRjtzTZg kNZwsilvrnwMs6vuPsPWEAU4+OvlWsyTSGO5L9Bod0wODf/WZNeXng3V+Mvy7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=7f3b00a87aff787e93c3896279105510440627f8 commit 7f3b00a87aff787e93c3896279105510440627f8 Author: Gleb Smirnoff AuthorDate: 2022-10-04 03:53:04 +0000 Commit: Gleb Smirnoff CommitDate: 2022-10-04 03:53:04 +0000 netinet: filter out invalid ICMP responses in ip_icmp() instead of doing that in every ipproto_ctlinput_t method. Reviewed by: melifaro Differential revision: https://reviews.freebsd.org/D36728 --- sys/netinet/ip_icmp.c | 3 +++ sys/netinet/sctp_usrreq.c | 3 --- sys/netinet/tcp_subr.c | 3 --- sys/netinet/udp_usrreq.c | 3 --- 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index 709f920106cc..f0cc703c2757 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -546,6 +546,9 @@ icmp_input(struct mbuf **mp, int *offp, int proto) /* Discard ICMP's in response to multicast packets */ if (IN_MULTICAST(ntohl(icp->icmp_ip.ip_dst.s_addr))) goto badcode; + /* Filter out responses to INADDR_ANY, protocols ignore it. */ + if (icp->icmp_ip.ip_dst.s_addr == INADDR_ANY) + goto freeit; #ifdef ICMPPRINTFS if (icmpprintfs) printf("deliver to protocol %d\n", icp->icmp_ip.ip_p); diff --git a/sys/netinet/sctp_usrreq.c b/sys/netinet/sctp_usrreq.c index e5ddac897d47..fdb195d79656 100644 --- a/sys/netinet/sctp_usrreq.c +++ b/sys/netinet/sctp_usrreq.c @@ -272,9 +272,6 @@ sctp_ctlinput(int cmd, struct sockaddr_in *sin, struct ip *ip) struct sctp_init_chunk *ch; struct sockaddr_in src, dst; - if (sin->sin_addr.s_addr == INADDR_ANY) { - return; - } if (PRC_IS_REDIRECT(cmd)) { ip = NULL; } else if ((unsigned)cmd >= PRC_NCMDS || inetctlerrmap[cmd] == 0) { diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 0b02f9b66651..e88b3b92b193 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -2866,9 +2866,6 @@ tcp_ctlinput_with_port(int cmd, struct sockaddr_in *sin, struct ip *ip, tcp_seq icmp_tcp_seq; int mtu; - if (sin->sin_addr.s_addr == INADDR_ANY) - return; - if (cmd == PRC_MSGSIZE) notify = tcp_mtudisc_notify; else if (V_icmp_may_rst && (cmd == PRC_UNREACH_ADMIN_PROHIB || diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index 68de037ada1a..372341a0351c 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -746,9 +746,6 @@ udp_common_ctlinput(int cmd, struct sockaddr_in *sin, struct ip *ip, struct udphdr *uh; struct inpcb *inp; - if (sin->sin_addr.s_addr == INADDR_ANY) - return; - if (PRC_IS_REDIRECT(cmd)) { /* signal EHOSTDOWN, as it flushes the cached route */ in_pcbnotifyall(pcbinfo, sin->sin_addr, EHOSTDOWN, udp_notify);