From nobody Tue Feb 25 04:01:58 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 4Z23nz1ZQwz5pNLg; Tue, 25 Feb 2025 04:01:59 +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 4Z23nz0WKHz3xSh; Tue, 25 Feb 2025 04:01:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740456119; 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=4hZ0eM6Y0+f09esMEhkYYIy6kjFx9PIJMKn2+98V8OI=; b=axqK4tBBOW3KkdcGTtxGd6K8Y7q5MakuekFZeYPDq4viv3q1OmNqB/97WWV+GgVu7T9sqW nSHmGtqbGdZeSsB6dHE4yqVjRz9w11IIHxPOZqcr4vyWGD1cWEjYbcipAxoXsutlzzVkST feqmDf/0AZQtzlI13HmZ53SJMUvTqxj13NilsO709b6oFXKMfq9gStiW2qepgF5XjOozGk jleuG/x6KXtnFWtRPEjrJRx8cOI0KISOeNMMQNFgRVQBmQtNCgzr/xiTfEiJH0t3p1kYlG wb3iUFk9Q/g8DUN6gGLIiVLoEPoVLyCmk96xvlRlVhBldtzjj7PkZ0utIn4YaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740456119; a=rsa-sha256; cv=none; b=LiyFsW9i8j8Xwx4L/F9vo4Ad4boG/JbpEe1CL+yvgon3t7bpNA5edQwkg8LLAnWt8c3mSC xee8u4r59DHv4ZtFImLcFrSTI9VErxgUwEdoiPKuTWgHMYpJF/6fPY+PYHkxjA/hUnF00j WagIUnKtu3wmHesEQykyfrUBPIZGRyTRx6VGx/2qk1kkh87ODmqlqh/husFSEeYnYMgV6i eo89JYGTzUk+Um5OOD4CvTTd/vnSV8w5xjPz4ZjguSW7TDoPBJ+QUN/t/GuQ6k7qfLvURt HLMEWa+LzyquSuuf33S1uLNVFQ94IO0auvHpDkIK5azQpXiHB6dIkGPj6XAk/w== 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=1740456119; 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=4hZ0eM6Y0+f09esMEhkYYIy6kjFx9PIJMKn2+98V8OI=; b=XQyrvz2zfrznzZfG0TeNlx/w7zk4pTnKpJBd/4ERPij82CbZ9wV9aKY+lBJEaaQtOGizvL U7QLxY/+vzy8yxsmhnZoHtudVSlYbGCBWkDLSYCZPd6+FBsl1mdpN0UIUmLhk9NO5NH6NJ fHogZstL1M08uB2007F+Af18r4TNYSbq1TssNJpac4VlC0DgwsruLuK0mzZqhju2dFKMDj UF5/M1e9sEqAHhDJcVO+8DZjsJLImPp6BaUOw/5zTFnqnwplVKlraGtEFS90hmVkOhAY3S cl3QtiBSA7UCY6nhzQKnEwNDjtXQgk56SEv75ZqYajWqZueBk5Dbnh1xagqHgg== 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 4Z23ny74w0z18Mp; Tue, 25 Feb 2025 04:01:58 +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 51P41wIW086335; Tue, 25 Feb 2025 04:01:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51P41wjT086332; Tue, 25 Feb 2025 04:01:58 GMT (envelope-from git) Date: Tue, 25 Feb 2025 04:01:58 GMT Message-Id: <202502250401.51P41wjT086332@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: cad2df3e90d1 - stable/14 - carp: Fix checking IPv4 multicast address 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: cad2df3e90d19b083de11f940b20678716811459 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=cad2df3e90d19b083de11f940b20678716811459 commit cad2df3e90d19b083de11f940b20678716811459 Author: Zhenlei Huang AuthorDate: 2025-02-22 19:26:33 +0000 Commit: Zhenlei Huang CommitDate: 2025-02-25 04:01:22 +0000 carp: Fix checking IPv4 multicast address An IPv4 address stored in `struct in_addr` is in network byte order but `IN_MULTICAST` wants host order. PR: 284872 Reported by: Steven Perreau Reported by: Brett Merrick Reviewed by: Franco Fichtner , ae, kp, glebius Tested by: Steven Perreau Fixes: 137818006de5 carp: support unicast MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D49053 (cherry picked from commit 1776633438f24df09cb9815650891bcef0152874) --- sys/netinet/ip_carp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c index ddbc13e7c878..3223a76c7860 100644 --- a/sys/netinet/ip_carp.c +++ b/sys/netinet/ip_carp.c @@ -722,7 +722,7 @@ carp_input_c(struct mbuf *m, struct carp_header *ch, sa_family_t af, int ttl) sc = ifa->ifa_carp; CARP_LOCK(sc); if (ifa->ifa_addr->sa_family == AF_INET) { - multicast = IN_MULTICAST(sc->sc_carpaddr.s_addr); + multicast = IN_MULTICAST(ntohl(sc->sc_carpaddr.s_addr)); } else { multicast = IN6_IS_ADDR_MULTICAST(&sc->sc_carpaddr6); } @@ -988,7 +988,7 @@ carp_send_ad_locked(struct carp_softc *sc) m->m_pkthdr.rcvif = NULL; m->m_len = len; M_ALIGN(m, m->m_len); - if (IN_MULTICAST(sc->sc_carpaddr.s_addr)) + if (IN_MULTICAST(ntohl(sc->sc_carpaddr.s_addr))) m->m_flags |= M_MCAST; ip = mtod(m, struct ip *); ip->ip_v = IPVERSION;