1 --- a/net/bridge/br_multicast.c
2 +++ b/net/bridge/br_multicast.c
3 @@ -634,7 +634,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 @@ -649,12 +650,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 @@ -681,13 +703,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 @@ -706,7 +728,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 @@ -717,14 +739,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 @@ -735,7 +757,10 @@ 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 + if (ipv6_addr_is_solict_mult(group))
98 + return br_multicast_add_group(br, port, &br_group, src);
102 @@ -949,6 +974,7 @@ static int br_ip4_multicast_igmp3_report
103 struct net_bridge_port *port,
106 + const unsigned char *src = eth_hdr(skb)->h_source;
107 struct igmpv3_report *ih;
108 struct igmpv3_grec *grec;
110 @@ -994,7 +1020,7 @@ static int br_ip4_multicast_igmp3_report
114 - err = br_ip4_multicast_add_group(br, port, group, vid);
115 + err = br_ip4_multicast_add_group(br, port, group, vid, src);
119 @@ -1007,6 +1033,7 @@ static int br_ip6_multicast_mld2_report(
120 struct net_bridge_port *port,
123 + const unsigned char *src = eth_hdr(skb)->h_source;
124 struct icmp6hdr *icmp6h;
125 struct mld2_grec *grec;
127 @@ -1057,7 +1084,7 @@ static int br_ip6_multicast_mld2_report(
130 err = br_ip6_multicast_add_group(br, port, &grec->grec_mca,
136 @@ -1302,7 +1329,8 @@ static void br_multicast_leave_group(str
137 struct net_bridge_port *port,
139 struct bridge_mcast_querier *querier,
140 - struct bridge_mcast_query *query)
141 + struct bridge_mcast_query *query,
142 + const unsigned char *src)
144 struct net_bridge_mdb_htable *mdb;
145 struct net_bridge_mdb_entry *mp;
146 @@ -1352,7 +1380,7 @@ static void br_multicast_leave_group(str
147 for (pp = &mp->ports;
148 (p = mlock_dereference(*pp, br)) != NULL;
150 - if (p->port != port)
151 + if (!br_port_group_equal(p, port, src))
154 rcu_assign_pointer(*pp, p->next);
155 @@ -1386,7 +1414,7 @@ static void br_multicast_leave_group(str
156 for (p = mlock_dereference(mp->ports, br);
158 p = mlock_dereference(p->next, br)) {
159 - if (p->port != port)
160 + if (!br_port_group_equal(p, port, src))
163 if (!hlist_unhashed(&p->mglist) &&
164 @@ -1404,8 +1432,8 @@ out:
166 static void br_ip4_multicast_leave_group(struct net_bridge *br,
167 struct net_bridge_port *port,
170 + __be32 group, __u16 vid,
171 + const unsigned char *src)
173 struct br_ip br_group;
174 struct bridge_mcast_query *query = port ? &port->ip4_query :
175 @@ -1418,14 +1446,15 @@ static void br_ip4_multicast_leave_group
176 br_group.proto = htons(ETH_P_IP);
179 - br_multicast_leave_group(br, port, &br_group, &br->ip4_querier, query);
180 + br_multicast_leave_group(br, port, &br_group, &br->ip4_querier, query,
184 #if IS_ENABLED(CONFIG_IPV6)
185 static void br_ip6_multicast_leave_group(struct net_bridge *br,
186 struct net_bridge_port *port,
187 const struct in6_addr *group,
189 + __u16 vid, const unsigned char *src)
191 struct br_ip br_group;
192 struct bridge_mcast_query *query = port ? &port->ip6_query :
193 @@ -1439,7 +1468,8 @@ static void br_ip6_multicast_leave_group
194 br_group.proto = htons(ETH_P_IPV6);
197 - br_multicast_leave_group(br, port, &br_group, &br->ip6_querier, query);
198 + br_multicast_leave_group(br, port, &br_group, &br->ip6_querier, query,
203 @@ -1447,6 +1477,7 @@ static int br_multicast_ipv4_rcv(struct
204 struct net_bridge_port *port,
207 + const unsigned char *src = eth_hdr(skb)->h_source;
208 struct sk_buff *skb2 = skb;
209 const struct iphdr *iph;
211 @@ -1522,7 +1553,7 @@ static int br_multicast_ipv4_rcv(struct
212 case IGMP_HOST_MEMBERSHIP_REPORT:
213 case IGMPV2_HOST_MEMBERSHIP_REPORT:
214 BR_INPUT_SKB_CB(skb)->mrouters_only = 1;
215 - err = br_ip4_multicast_add_group(br, port, ih->group, vid);
216 + err = br_ip4_multicast_add_group(br, port, ih->group, vid, src);
218 case IGMPV3_HOST_MEMBERSHIP_REPORT:
219 err = br_ip4_multicast_igmp3_report(br, port, skb2);
220 @@ -1531,7 +1562,7 @@ static int br_multicast_ipv4_rcv(struct
221 err = br_ip4_multicast_query(br, port, skb2);
223 case IGMP_HOST_LEAVE_MESSAGE:
224 - br_ip4_multicast_leave_group(br, port, ih->group, vid);
225 + br_ip4_multicast_leave_group(br, port, ih->group, vid, src);
229 @@ -1548,6 +1579,7 @@ static int br_multicast_ipv6_rcv(struct
230 struct net_bridge_port *port,
233 + const unsigned char *src = eth_hdr(skb)->h_source;
234 struct sk_buff *skb2;
235 const struct ipv6hdr *ip6h;
237 @@ -1659,7 +1691,8 @@ static int br_multicast_ipv6_rcv(struct
239 mld = (struct mld_msg *)skb_transport_header(skb2);
240 BR_INPUT_SKB_CB(skb)->mrouters_only = 1;
241 - err = br_ip6_multicast_add_group(br, port, &mld->mld_mca, vid);
242 + err = br_ip6_multicast_add_group(br, port, &mld->mld_mca, vid,
246 case ICMPV6_MLD2_REPORT:
247 @@ -1676,7 +1709,7 @@ static int br_multicast_ipv6_rcv(struct
250 mld = (struct mld_msg *)skb_transport_header(skb2);
251 - br_ip6_multicast_leave_group(br, port, &mld->mld_mca, vid);
252 + br_ip6_multicast_leave_group(br, port, &mld->mld_mca, vid, src);
256 --- a/net/bridge/br_private.h
257 +++ b/net/bridge/br_private.h
258 @@ -115,6 +115,9 @@ struct net_bridge_port_group {
259 struct timer_list timer;
263 + unsigned char eth_addr[ETH_ALEN];
267 struct net_bridge_mdb_entry
268 @@ -172,6 +175,7 @@ struct net_bridge_port
269 #define BR_MULTICAST_FAST_LEAVE 0x00000008
270 #define BR_ADMIN_COST 0x00000010
271 #define BR_ISOLATE_MODE 0x00000020
272 +#define BR_MULTICAST_TO_UCAST 0x00000040
274 #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
275 struct bridge_mcast_query ip4_query;
276 @@ -489,7 +493,8 @@ extern struct net_bridge_port_group *br_
277 struct net_bridge_port *port,
279 struct net_bridge_port_group *next,
280 - unsigned char state);
281 + unsigned char state,
282 + const unsigned char *src);
283 extern void br_mdb_init(void);
284 extern void br_mdb_uninit(void);
285 extern void br_mdb_notify(struct net_device *dev, struct net_bridge_port *port,
286 --- a/net/bridge/br_mdb.c
287 +++ b/net/bridge/br_mdb.c
288 @@ -341,7 +341,7 @@ static int br_mdb_add_group(struct net_b
292 - p = br_multicast_new_port_group(port, group, *pp, state);
293 + p = br_multicast_new_port_group(port, group, *pp, state, NULL);
296 rcu_assign_pointer(*pp, p);
297 --- a/net/bridge/br_forward.c
298 +++ b/net/bridge/br_forward.c
299 @@ -170,6 +170,29 @@ out:
303 +static struct net_bridge_port *maybe_deliver_addr(
304 + struct net_bridge_port *prev, struct net_bridge_port *p,
305 + struct sk_buff *skb, const unsigned char *addr,
306 + void (*__packet_hook)(const struct net_bridge_port *p,
307 + struct sk_buff *skb))
309 + struct net_device *dev = BR_INPUT_SKB_CB(skb)->brdev;
311 + if (!should_deliver(p, skb))
314 + skb = skb_copy(skb, GFP_ATOMIC);
316 + dev->stats.tx_dropped++;
320 + memcpy(eth_hdr(skb)->h_dest, addr, ETH_ALEN);
321 + __packet_hook(p, skb);
326 /* called under bridge lock */
327 static void br_flood(struct net_bridge *br, struct sk_buff *skb,
328 struct sk_buff *skb0,
329 @@ -232,6 +255,7 @@ static void br_multicast_flood(struct ne
330 struct net_bridge_port *prev = NULL;
331 struct net_bridge_port_group *p;
332 struct hlist_node *rp;
333 + const unsigned char *addr;
335 rp = rcu_dereference(hlist_first_rcu(&br->router_list));
336 p = mdst ? rcu_dereference(mdst->ports) : NULL;
337 @@ -242,10 +266,19 @@ static void br_multicast_flood(struct ne
338 rport = rp ? hlist_entry(rp, struct net_bridge_port, rlist) :
341 - port = (unsigned long)lport > (unsigned long)rport ?
344 - prev = maybe_deliver(prev, port, skb, __packet_hook);
345 + if ((unsigned long)lport > (unsigned long)rport) {
347 + addr = p->unicast ? p->eth_addr : NULL;
354 + prev = maybe_deliver_addr(prev, port, skb, addr,
357 + prev = maybe_deliver(prev, port, skb, __packet_hook);
361 --- a/net/bridge/br_sysfs_if.c
362 +++ b/net/bridge/br_sysfs_if.c
363 @@ -190,6 +190,7 @@ static BRPORT_ATTR(multicast_router, S_I
364 store_multicast_router);
366 BRPORT_ATTR_FLAG(multicast_fast_leave, BR_MULTICAST_FAST_LEAVE);
367 +BRPORT_ATTR_FLAG(multicast_to_unicast, BR_MULTICAST_TO_UCAST);
370 static const struct brport_attribute *brport_attrs[] = {
371 @@ -214,6 +215,7 @@ static const struct brport_attribute *br
372 #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
373 &brport_attr_multicast_router,
374 &brport_attr_multicast_fast_leave,
375 + &brport_attr_multicast_to_unicast,
377 &brport_attr_isolate_mode,