1 --- a/net/bridge/br_multicast.c
2 +++ b/net/bridge/br_multicast.c
3 @@ -630,7 +630,8 @@ struct net_bridge_port_group *br_multica
4 struct net_bridge_port *port,
6 struct net_bridge_port_group __rcu *next,
9 + const unsigned char *src)
11 struct net_bridge_port_group *p;
13 @@ -645,12 +646,33 @@ struct net_bridge_port_group *br_multica
14 hlist_add_head(&p->mglist, &port->mglist);
15 setup_timer(&p->timer, br_multicast_port_group_expired,
17 + if ((port->flags & BR_MULTICAST_TO_UCAST) && src) {
18 + memcpy(p->eth_addr, src, ETH_ALEN);
24 +static bool br_port_group_equal(struct net_bridge_port_group *p,
25 + struct net_bridge_port *port,
26 + const unsigned char *src)
28 + if (p->port != port)
37 + return ether_addr_equal(src, p->eth_addr);
40 static int br_multicast_add_group(struct net_bridge *br,
41 struct net_bridge_port *port,
42 - struct br_ip *group)
43 + struct br_ip *group,
44 + const unsigned char *src)
46 struct net_bridge_mdb_entry *mp;
47 struct net_bridge_port_group *p;
48 @@ -677,13 +699,13 @@ static int br_multicast_add_group(struct
50 (p = mlock_dereference(*pp, br)) != NULL;
52 - if (p->port == port)
53 + if (br_port_group_equal(p, port, src))
55 if ((unsigned long)p->port < (unsigned long)port)
59 - p = br_multicast_new_port_group(port, group, *pp, MDB_TEMPORARY);
60 + p = br_multicast_new_port_group(port, group, *pp, MDB_TEMPORARY, src);
63 rcu_assign_pointer(*pp, p);
64 @@ -702,7 +724,7 @@ err:
65 static int br_ip4_multicast_add_group(struct net_bridge *br,
66 struct net_bridge_port *port,
69 + __u16 vid, const unsigned char *src)
71 struct br_ip br_group;
73 @@ -713,14 +735,14 @@ static int br_ip4_multicast_add_group(st
74 br_group.proto = htons(ETH_P_IP);
77 - return br_multicast_add_group(br, port, &br_group);
78 + return br_multicast_add_group(br, port, &br_group, src);
81 #if IS_ENABLED(CONFIG_IPV6)
82 static int br_ip6_multicast_add_group(struct net_bridge *br,
83 struct net_bridge_port *port,
84 const struct in6_addr *group,
86 + __u16 vid, const unsigned char *src)
88 struct br_ip br_group;
90 @@ -731,7 +753,7 @@ static int br_ip6_multicast_add_group(st
91 br_group.proto = htons(ETH_P_IPV6);
94 - return br_multicast_add_group(br, port, &br_group);
95 + return br_multicast_add_group(br, port, &br_group, src);
99 @@ -898,6 +920,7 @@ static int br_ip4_multicast_igmp3_report
100 struct net_bridge_port *port,
103 + const unsigned char *src = eth_hdr(skb)->h_source;
104 struct igmpv3_report *ih;
105 struct igmpv3_grec *grec;
107 @@ -943,7 +966,7 @@ static int br_ip4_multicast_igmp3_report
111 - err = br_ip4_multicast_add_group(br, port, group, vid);
112 + err = br_ip4_multicast_add_group(br, port, group, vid, src);
116 @@ -956,6 +979,7 @@ static int br_ip6_multicast_mld2_report(
117 struct net_bridge_port *port,
120 + const unsigned char *src = eth_hdr(skb)->h_source;
121 struct icmp6hdr *icmp6h;
122 struct mld2_grec *grec;
124 @@ -1006,7 +1030,7 @@ static int br_ip6_multicast_mld2_report(
127 err = br_ip6_multicast_add_group(br, port, &grec->grec_mca,
133 @@ -1235,7 +1259,8 @@ out:
135 static void br_multicast_leave_group(struct net_bridge *br,
136 struct net_bridge_port *port,
137 - struct br_ip *group)
138 + struct br_ip *group,
139 + const unsigned char *src)
141 struct net_bridge_mdb_htable *mdb;
142 struct net_bridge_mdb_entry *mp;
143 @@ -1260,7 +1285,7 @@ static void br_multicast_leave_group(str
144 for (pp = &mp->ports;
145 (p = mlock_dereference(*pp, br)) != NULL;
147 - if (p->port != port)
148 + if (!br_port_group_equal(p, port, src))
151 rcu_assign_pointer(*pp, p->next);
152 @@ -1294,7 +1319,7 @@ static void br_multicast_leave_group(str
153 for (p = mlock_dereference(mp->ports, br);
155 p = mlock_dereference(p->next, br)) {
156 - if (p->port != port)
157 + if (!br_port_group_equal(p, port, src))
160 if (!hlist_unhashed(&p->mglist) &&
161 @@ -1313,8 +1338,8 @@ out:
163 static void br_ip4_multicast_leave_group(struct net_bridge *br,
164 struct net_bridge_port *port,
167 + __be32 group, __u16 vid,
168 + const unsigned char *src)
170 struct br_ip br_group;
172 @@ -1325,14 +1350,14 @@ static void br_ip4_multicast_leave_group
173 br_group.proto = htons(ETH_P_IP);
176 - br_multicast_leave_group(br, port, &br_group);
177 + br_multicast_leave_group(br, port, &br_group, src);
180 #if IS_ENABLED(CONFIG_IPV6)
181 static void br_ip6_multicast_leave_group(struct net_bridge *br,
182 struct net_bridge_port *port,
183 const struct in6_addr *group,
185 + __u16 vid, const unsigned char *src)
187 struct br_ip br_group;
189 @@ -1343,7 +1368,7 @@ static void br_ip6_multicast_leave_group
190 br_group.proto = htons(ETH_P_IPV6);
193 - br_multicast_leave_group(br, port, &br_group);
194 + br_multicast_leave_group(br, port, &br_group, src);
198 @@ -1351,6 +1376,7 @@ static int br_multicast_ipv4_rcv(struct
199 struct net_bridge_port *port,
202 + const unsigned char *src = eth_hdr(skb)->h_source;
203 struct sk_buff *skb2 = skb;
204 const struct iphdr *iph;
206 @@ -1426,7 +1452,7 @@ static int br_multicast_ipv4_rcv(struct
207 case IGMP_HOST_MEMBERSHIP_REPORT:
208 case IGMPV2_HOST_MEMBERSHIP_REPORT:
209 BR_INPUT_SKB_CB(skb)->mrouters_only = 1;
210 - err = br_ip4_multicast_add_group(br, port, ih->group, vid);
211 + err = br_ip4_multicast_add_group(br, port, ih->group, vid, src);
213 case IGMPV3_HOST_MEMBERSHIP_REPORT:
214 err = br_ip4_multicast_igmp3_report(br, port, skb2);
215 @@ -1435,7 +1461,7 @@ static int br_multicast_ipv4_rcv(struct
216 err = br_ip4_multicast_query(br, port, skb2);
218 case IGMP_HOST_LEAVE_MESSAGE:
219 - br_ip4_multicast_leave_group(br, port, ih->group, vid);
220 + br_ip4_multicast_leave_group(br, port, ih->group, vid, src);
224 @@ -1452,6 +1478,7 @@ static int br_multicast_ipv6_rcv(struct
225 struct net_bridge_port *port,
228 + const unsigned char *src = eth_hdr(skb)->h_source;
229 struct sk_buff *skb2;
230 const struct ipv6hdr *ip6h;
232 @@ -1557,7 +1584,8 @@ static int br_multicast_ipv6_rcv(struct
234 mld = (struct mld_msg *)skb_transport_header(skb2);
235 BR_INPUT_SKB_CB(skb)->mrouters_only = 1;
236 - err = br_ip6_multicast_add_group(br, port, &mld->mld_mca, vid);
237 + err = br_ip6_multicast_add_group(br, port, &mld->mld_mca, vid,
241 case ICMPV6_MLD2_REPORT:
242 @@ -1574,7 +1602,7 @@ static int br_multicast_ipv6_rcv(struct
245 mld = (struct mld_msg *)skb_transport_header(skb2);
246 - br_ip6_multicast_leave_group(br, port, &mld->mld_mca, vid);
247 + br_ip6_multicast_leave_group(br, port, &mld->mld_mca, vid, src);
251 --- a/net/bridge/br_private.h
252 +++ b/net/bridge/br_private.h
253 @@ -101,6 +101,9 @@ struct net_bridge_port_group {
254 struct timer_list timer;
258 + unsigned char eth_addr[ETH_ALEN];
262 struct net_bridge_mdb_entry
263 @@ -158,6 +161,7 @@ struct net_bridge_port
264 #define BR_MULTICAST_FAST_LEAVE 0x00000008
265 #define BR_ADMIN_COST 0x00000010
266 #define BR_ISOLATE_MODE 0x00000020
267 +#define BR_MULTICAST_TO_UCAST 0x00000040
269 #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
270 u32 multicast_startup_queries_sent;
271 @@ -469,7 +473,8 @@ extern struct net_bridge_port_group *br_
272 struct net_bridge_port *port,
274 struct net_bridge_port_group *next,
275 - unsigned char state);
276 + unsigned char state,
277 + const unsigned char *src);
278 extern void br_mdb_init(void);
279 extern void br_mdb_uninit(void);
280 extern void br_mdb_notify(struct net_device *dev, struct net_bridge_port *port,
281 --- a/net/bridge/br_mdb.c
282 +++ b/net/bridge/br_mdb.c
283 @@ -340,7 +340,7 @@ static int br_mdb_add_group(struct net_b
287 - p = br_multicast_new_port_group(port, group, *pp, state);
288 + p = br_multicast_new_port_group(port, group, *pp, state, NULL);
291 rcu_assign_pointer(*pp, p);
292 --- a/net/bridge/br_forward.c
293 +++ b/net/bridge/br_forward.c
294 @@ -170,6 +170,29 @@ out:
298 +static struct net_bridge_port *maybe_deliver_addr(
299 + struct net_bridge_port *prev, struct net_bridge_port *p,
300 + struct sk_buff *skb, const unsigned char *addr,
301 + void (*__packet_hook)(const struct net_bridge_port *p,
302 + struct sk_buff *skb))
304 + struct net_device *dev = BR_INPUT_SKB_CB(skb)->brdev;
306 + if (!should_deliver(p, skb))
309 + skb = skb_copy(skb, GFP_ATOMIC);
311 + dev->stats.tx_dropped++;
315 + memcpy(eth_hdr(skb)->h_dest, addr, ETH_ALEN);
316 + __packet_hook(p, skb);
321 /* called under bridge lock */
322 static void br_flood(struct net_bridge *br, struct sk_buff *skb,
323 struct sk_buff *skb0,
324 @@ -232,6 +255,7 @@ static void br_multicast_flood(struct ne
325 struct net_bridge_port *prev = NULL;
326 struct net_bridge_port_group *p;
327 struct hlist_node *rp;
328 + const unsigned char *addr;
330 rp = rcu_dereference(hlist_first_rcu(&br->router_list));
331 p = mdst ? rcu_dereference(mdst->ports) : NULL;
332 @@ -242,10 +266,19 @@ static void br_multicast_flood(struct ne
333 rport = rp ? hlist_entry(rp, struct net_bridge_port, rlist) :
336 - port = (unsigned long)lport > (unsigned long)rport ?
339 - prev = maybe_deliver(prev, port, skb, __packet_hook);
340 + if ((unsigned long)lport > (unsigned long)rport) {
342 + addr = p->unicast ? p->eth_addr : NULL;
349 + prev = maybe_deliver_addr(prev, port, skb, addr,
352 + prev = maybe_deliver(prev, port, skb, __packet_hook);
356 --- a/net/bridge/br_sysfs_if.c
357 +++ b/net/bridge/br_sysfs_if.c
358 @@ -190,6 +190,7 @@ static BRPORT_ATTR(multicast_router, S_I
359 store_multicast_router);
361 BRPORT_ATTR_FLAG(multicast_fast_leave, BR_MULTICAST_FAST_LEAVE);
362 +BRPORT_ATTR_FLAG(multicast_to_unicast, BR_MULTICAST_TO_UCAST);
365 static const struct brport_attribute *brport_attrs[] = {
366 @@ -214,6 +215,7 @@ static const struct brport_attribute *br
367 #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
368 &brport_attr_multicast_router,
369 &brport_attr_multicast_fast_leave,
370 + &brport_attr_multicast_to_unicast,
372 &brport_attr_isolate_mode,