From nobody Sat Feb 22 02:12:45 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 4Z09WK2fdqz5nqLS; Sat, 22 Feb 2025 02:12:45 +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 4Z09WK1lC0z3hcX; Sat, 22 Feb 2025 02:12:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740190365; 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=QICpMOY1BSNOr9v2He9ccaE2dVxtmYvm42JZN9Rpo6s=; b=WeQR4qYZ8jY9oMLVCK+fzJkFMHAGI762NmBr6iI/msgkdOTZoJzJZGBIELqG0vJMCe0hlk 7atJ7e0SHiarQrPlArqo8igs7N15kuzy+RGuBHh1QQhnR/IPmDbnPsIIvfGOV/EaZXQi0T AqXizzUWASzqeA1z+zbcBSzux7vIWaSFRqJ/lmMFRhcXXS0IDQFbSFkMkKo7PBWsgGe5y+ Hsi29Kiq7N/XuCmARi91dQMZ2u49w/1HXxAtN4L8gY/m2MW11kUQU4XBV68Zqt1snt1kvf UYY4skuEtzy+OdPQACe5NzzMGfJEP4CdJcbj2LtYPQaRAcdZ5xqo9Tq4+Z2PSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740190365; a=rsa-sha256; cv=none; b=j8unIulUwAhHHSQf65mQqsBKOTGhwgj57side03WSbLCOJH2IQ9LqMJPW8wFIHSQ2LGaki 7tQiIGIikb82Po6e5Z2XicjJhx/DeUVrzDTlS6SuMX1ySwIs8+PoNnkKiGPad5WGYHaycA YY/vF8Hn3qHX58vPPRy8+v9uX5TUgMrOmE/UwQOHh4oCGlgm4ZocdjV2J4+BY9fkRPgVq4 bZuwQgju/JonV8RoLRdu8y6dWZJq2Q2rNTlbXoXjTcN7RY8sJ5jhNAMwv0RqT2g/XmS+OC 6VoOqJ5ySzCLJLvBcVqkijlsANczzalt2T5nwb8v12dsC60H+J2DF0rSiuPfOw== 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=1740190365; 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=QICpMOY1BSNOr9v2He9ccaE2dVxtmYvm42JZN9Rpo6s=; b=NSlwIh0qNqce6wDsu83LNP/mrgHYAgr+mOIJpmIZbwAmT7jev1pj0qChBOPUVhUUEbpGAN aAQi6fv+MZJQTJNpGm8oO7qCJYqFcT6MB1KoF5oCJtQgyto69j728SuoN1f10kCZMwUgWo u7HeGWoCB6VsS83XDVAejQZfdllH29U8SG2TJL2eU3NWVbI+JNvycqKE5szkwgHNmBmLWs uIxjqqjlayNA2kRBEsG9RoYboNCOy6EVAc+7AWQejGVPC/ceEB9pFP9YSBJdrwmveuBIWN ROXqwJzEZYffClfhZQoup/Ev3r0EdOa+8eeZy3jTnSrR2RWjQgnWme6GPOU0Ug== 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 4Z09WK1FlDzpfJ; Sat, 22 Feb 2025 02:12:45 +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 51M2Cj0V099253; Sat, 22 Feb 2025 02:12:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51M2CjUT099250; Sat, 22 Feb 2025 02:12:45 GMT (envelope-from git) Date: Sat, 22 Feb 2025 02:12:45 GMT Message-Id: <202502220212.51M2CjUT099250@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: 3b281d1421a7 - main - netinet: enforce broadcast mode for all-ones and all-zeroes destinations 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3b281d1421a78b588c5fc4182009ce62d8823d95 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=3b281d1421a78b588c5fc4182009ce62d8823d95 commit 3b281d1421a78b588c5fc4182009ce62d8823d95 Author: Gleb Smirnoff AuthorDate: 2025-02-22 02:11:00 +0000 Commit: Gleb Smirnoff CommitDate: 2025-02-22 02:11:00 +0000 netinet: enforce broadcast mode for all-ones and all-zeroes destinations When a socket has SO_BROADCAST set and destination address is INADDR_ANY or INADDR_BROADCAST, the kernel shall pick up first broadcast capable interface and broadcast the packet out of it. Since this API is not reliable on a machine with > 1 broadcast capable interfaces, all practical software seems to use IP_ONESBCAST or other mechanisms to send broadcasts. This has been broken at least since FreeBSD 6.0, see bug 99558. Back then the problem was in the fact that in_broadcast() check was always done against the gateway address, not the destination address. Later, with 90cc51a1ab4be, a second problem piled on top - we aren't checking for INADDR_ANY and INADDR_BROADCAST at all. Better late than never, fix that by checking destination address. PR: 99558 Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D49042 --- sys/netinet/in.h | 7 +++++++ sys/netinet/ip_output.c | 15 ++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/sys/netinet/in.h b/sys/netinet/in.h index 0ee4200017b5..fa710af7cd58 100644 --- a/sys/netinet/in.h +++ b/sys/netinet/in.h @@ -686,6 +686,13 @@ char *inet_ntop(int, const void *, char *, socklen_t); /* in libkern */ int inet_pton(int af, const char *, void *); /* in libkern */ void in_ifdetach(struct ifnet *); +static inline bool +in_broadcast(struct in_addr in) +{ + return (in.s_addr == htonl(INADDR_BROADCAST) || + in.s_addr == htonl(INADDR_ANY)); +} + #define in_hosteq(s, t) ((s).s_addr == (t).s_addr) #define in_nullhost(x) ((x).s_addr == INADDR_ANY) #define in_allhosts(x) ((x).s_addr == htonl(INADDR_ALLHOSTS_GROUP)) diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index 1811becbf387..35aaf85d6a4e 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -449,7 +449,8 @@ again: mtu = ifp->if_mtu; ip->ip_ttl = 1; isbroadcast = ifp->if_flags & IFF_BROADCAST ? - in_ifaddr_broadcast(dst->sin_addr, ia) : 0; + (in_broadcast(ip->ip_dst) || + in_ifaddr_broadcast(dst->sin_addr, ia)) : 0; src = IA_SIN(ia)->sin_addr; } else if (IN_MULTICAST(ntohl(ip->ip_dst.s_addr)) && imo != NULL && imo->imo_multicast_ifp != NULL) { @@ -502,8 +503,11 @@ again: gw = &nh->gw_sa; if (nh->nh_flags & NHF_HOST) isbroadcast = (nh->nh_flags & NHF_BROADCAST); - else if ((ifp->if_flags & IFF_BROADCAST) && (gw->sa_family == AF_INET)) - isbroadcast = in_ifaddr_broadcast(((const struct sockaddr_in *)gw)->sin_addr, ia); + else if ((ifp->if_flags & IFF_BROADCAST) && + (gw->sa_family == AF_INET)) + isbroadcast = in_broadcast(ip->ip_dst) || + in_ifaddr_broadcast( + ((const struct sockaddr_in *)gw)->sin_addr, ia); else isbroadcast = false; mtu = nh->nh_mtu; @@ -533,11 +537,12 @@ again: gw = &nh->gw_sa; ia = ifatoia(nh->nh_ifa); src = IA_SIN(ia)->sin_addr; - isbroadcast = (((nh->nh_flags & (NHF_HOST | NHF_BROADCAST)) == + isbroadcast = ((nh->nh_flags & (NHF_HOST | NHF_BROADCAST)) == (NHF_HOST | NHF_BROADCAST)) || ((ifp->if_flags & IFF_BROADCAST) && (gw->sa_family == AF_INET) && - in_ifaddr_broadcast(((const struct sockaddr_in *)gw)->sin_addr, ia))); + (in_broadcast(ip->ip_dst) || in_ifaddr_broadcast( + ((const struct sockaddr_in *)gw)->sin_addr, ia))); } /* Catch a possible divide by zero later. */