From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 21BEBC10F00 for ; Fri, 22 Feb 2019 13:23:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E22132081B for ; Fri, 22 Feb 2019 13:23:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="J/9JuPiZ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726482AbfBVNXI (ORCPT ); Fri, 22 Feb 2019 08:23:08 -0500 Received: from mail-pf1-f196.google.com ([209.85.210.196]:33773 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725944AbfBVNXI (ORCPT ); Fri, 22 Feb 2019 08:23:08 -0500 Received: by mail-pf1-f196.google.com with SMTP id i19so1141108pfd.0; Fri, 22 Feb 2019 05:23:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=r4Yx9fRpmv7GzZ3sYiiGHfYdV5cj2xhoIMtaPA3H4eo=; b=J/9JuPiZN+NwyOtJU5Ru5t2/RmnHpRiRuO3wMVlamNIQmILZZ+gF3ohGPO/R9zqdE9 QNUdaEaBnSD2/DpuZrCxPOx3+Y/EcC6cF4ZTicX0h7fNb7K/xvzXQgra01fhm49/RH2t waVVyVdq7NscNQt+tDhSUT05FF33F/UN8zzPK7PiDE+CKaaIGasUzCR0erUF+92s03FM IZg7RR8U06C3M9x5VPKgRCW0gE2QRgyT/tOz48S9XjfCxFJt/HNQVa6rpDGwVSWAiPtq zXsIDSYNh1Xf9yQ9ZZU0qQ0GXYz/wdWRj1JS4a8O/SD3h1gbnUy6W1Ei1LCRES8f1dyg swsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=r4Yx9fRpmv7GzZ3sYiiGHfYdV5cj2xhoIMtaPA3H4eo=; b=bq9Dx6DvuPWzfg/SdPSM7rlNtidBu9RQSSuVcO13aF5NLn4wJF79jqtuce/nbd8kJk vPEU67deH113u/jjevpR0gFLcKIUWTfHbiCBaHTKT6qFTCgisOB90zmqj0MFWHG9HLwk xoEdaDn5SSAvoT8Myakf4Lz0WiuqFDbFDL7IR0MObjnQ4I7djAg6uKpYVHcRFmVnFM7g V55tkAVlzlVnzYi49VjIMPxKD8ZmJTYayghpDmDQ4aLuB/zwQZj7Ugd2zbAtnm9V6aqx XSlpBr+5bccjFvd06zn/PMeDnpcmcCroJl4tL+4l2RzyJipxeWUvV8QLe5aHWDSMyJ0L emeA== X-Gm-Message-State: AHQUAubdDoMx67+bFvV7XsctoDVBl1D9Nm03J/zO1gzUvH64mGg8p8iB EFRhnnnexkS7o4MdF3iWkYQ7U/WyKCY/JQ== X-Google-Smtp-Source: AHgI3IZIbG/6ApG/16BCNmPqY0W7X2cQ75CpT77pjXHLkWiTF+lQJBFV4qBlZdmRW/zquzMP9D92EA== X-Received: by 2002:aa7:8059:: with SMTP id y25mr4191801pfm.74.1550841787385; Fri, 22 Feb 2019 05:23:07 -0800 (PST) Received: from dhcp-12-139.nay.redhat.com ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id a20sm4856447pfj.5.2019.02.22.05.23.03 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 22 Feb 2019 05:23:06 -0800 (PST) From: Hangbin Liu To: netdev@vger.kernel.org Cc: Nikolay Aleksandrov , roopa@cumulusnetworks.com, bridge@lists.linux-foundation.org, davem@davemloft.net, yinxu@redhat.com, Greg Kroah-Hartman , stable@vger.kernel.org, Sebastian Gottschall , =?UTF-8?q?Linus=20L=C3=BCssing?= , Hangbin Liu Subject: [PATCH net] Revert "bridge: do not add port to router list when receives query with source 0.0.0.0" Date: Fri, 22 Feb 2019 21:22:32 +0800 Message-Id: <20190222132232.24123-1-liuhangbin@gmail.com> X-Mailer: git-send-email 2.19.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This reverts commit 5a2de63fd1a5 ("bridge: do not add port to router list when receives query with source 0.0.0.0") and commit 0fe5119e267f ("net: bridge: remove ipv6 zero address check in mcast queries") The reason is RFC 4541 is not a standard but suggestive. Currently we will elect 0.0.0.0 as Querier if there is no ip address configured on bridge. If we do not add the port which recives query with source 0.0.0.0 to router list, the IGMP reports will not be about to forward to Querier, IGMP data will also not be able to forward to dest. As Nikolay suggested, revert this change first and add a boolopt api to disable none-zero election in future if needed. Reported-by: Linus Lüssing Reported-by: Sebastian Gottschall Fixes: 5a2de63fd1a5 ("bridge: do not add port to router list when receives query with source 0.0.0.0") Fixes: 0fe5119e267f ("net: bridge: remove ipv6 zero address check in mcast queries") Signed-off-by: Hangbin Liu --- net/bridge/br_multicast.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c index 3aeff0895669..ac92b2eb32b1 100644 --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c @@ -1204,14 +1204,7 @@ static void br_multicast_query_received(struct net_bridge *br, return; br_multicast_update_query_timer(br, query, max_delay); - - /* Based on RFC4541, section 2.1.1 IGMP Forwarding Rules, - * the arrival port for IGMP Queries where the source address - * is 0.0.0.0 should not be added to router port list. - */ - if ((saddr->proto == htons(ETH_P_IP) && saddr->u.ip4) || - saddr->proto == htons(ETH_P_IPV6)) - br_multicast_mark_router(br, port); + br_multicast_mark_router(br, port); } static void br_ip4_multicast_query(struct net_bridge *br, -- 2.19.2