3 files changed, 31 insertions, 1 deletions

diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 81f2389f78eb..247514793101 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -23,6 +23,7 @@
 #include <linux/skbuff.h>
 #include <linux/slab.h>
 #include <linux/timer.h>
+#include <linux/inetdevice.h>
 #include <net/ip.h>
 #if IS_ENABLED(CONFIG_IPV6)
 #include <net/ipv6.h>
@@ -381,7 +382,8 @@ static struct sk_buff *br_ip4_multicast_alloc_query(struct net_bridge *br,
         iph->frag_off = htons(IP_DF);
         iph->ttl = 1;
         iph->protocol = IPPROTO_IGMP;
-        iph->saddr = 0;
+        iph->saddr = br->multicast_query_use_ifaddr ?
+                     inet_select_addr(br->dev, 0, RT_SCOPE_LINK) : 0;
         iph->daddr = htonl(INADDR_ALLHOSTS_GROUP);
         ((u8 *)&iph[1])[0] = IPOPT_RA;
         ((u8 *)&iph[1])[1] = 4;
@@ -1618,6 +1620,7 @@ void br_multicast_init(struct net_bridge *br)
 
         br->multicast_router = 1;
         br->multicast_querier = 0;
+        br->multicast_query_use_ifaddr = 0;
         br->multicast_last_member_count = 2;
         br->multicast_startup_query_count = 2;
 
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index d2c043a857b6..e260710a01d4 100644
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -249,6 +249,7 @@ struct net_bridge
 
         u8                              multicast_disabled:1;
         u8                              multicast_querier:1;
+        u8                              multicast_query_use_ifaddr:1;
 
         u32                             hash_elasticity;
         u32                             hash_max;
diff --git a/net/bridge/br_sysfs_br.c b/net/bridge/br_sysfs_br.c
index 8baa9c08e1a4..394bb96b6087 100644
--- a/net/bridge/br_sysfs_br.c
+++ b/net/bridge/br_sysfs_br.c
@@ -375,6 +375,31 @@ static ssize_t store_multicast_snooping(struct device *d,
 static DEVICE_ATTR(multicast_snooping, S_IRUGO | S_IWUSR,
                    show_multicast_snooping, store_multicast_snooping);
 
+static ssize_t show_multicast_query_use_ifaddr(struct device *d,
+                                      struct device_attribute *attr,
+                                      char *buf)
+{
+        struct net_bridge *br = to_bridge(d);
+        return sprintf(buf, "%d\n", br->multicast_query_use_ifaddr);
+}
+
+static int set_query_use_ifaddr(struct net_bridge *br, unsigned long val)
+{
+        br->multicast_query_use_ifaddr = !!val;
+        return 0;
+}
+
+static ssize_t
+store_multicast_query_use_ifaddr(struct device *d,
+                                 struct device_attribute *attr,
+                                 const char *buf, size_t len)
+{
+        return store_bridge_parm(d, buf, len, set_query_use_ifaddr);
+}
+static DEVICE_ATTR(multicast_query_use_ifaddr, S_IRUGO | S_IWUSR,
+                   show_multicast_query_use_ifaddr,
+                   store_multicast_query_use_ifaddr);
+
 static ssize_t show_multicast_querier(struct device *d,
                                       struct device_attribute *attr,
                                       char *buf)
@@ -734,6 +759,7 @@ static struct attribute *bridge_attrs[] = {
         &dev_attr_multicast_router.attr,
         &dev_attr_multicast_snooping.attr,
         &dev_attr_multicast_querier.attr,
+        &dev_attr_multicast_query_use_ifaddr.attr,
         &dev_attr_hash_elasticity.attr,
         &dev_attr_hash_max.attr,
         &dev_attr_multicast_last_member_count.attr,