update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/net/bridge/br_forward.c
..
..
@@ -1,14 +1,10 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
  *	Forwarding decision
3
4
  *	Linux ethernet bridge
4
5
  *
5
6
  *	Authors:
6
7
  *	Lennert Buytenhek		<buytenh@gnu.org>
7
- *
8
- *	This program is free software; you can redistribute it and/or
9
- *	modify it under the terms of the GNU General Public License
10
- *	as published by the Free Software Foundation; either version
11
- *	2 of the License, or (at your option) any later version.
12
8
  */
13
9
 
14
10
 #include <linux/err.h>
..
..
@@ -29,7 +25,7 @@
29
25
 
30
26
 	vg = nbp_vlan_group_rcu(p);
31
27
 	return ((p->flags & BR_HAIRPIN_MODE) || skb->dev != p->dev) &&
32
-		br_allowed_egress(vg, skb) && p->state == BR_STATE_FORWARDING &&
28
+		p->state == BR_STATE_FORWARDING && br_allowed_egress(vg, skb) &&
33
29
 		nbp_switchdev_allowed_egress(p, skb) &&
34
30
 		!br_skb_isolated(p, skb);
35
31
 }
..
..
@@ -47,7 +43,7 @@
47
43
 	     skb->protocol == htons(ETH_P_8021AD))) {
48
44
 		int depth;
49
45
 
50
-		if (!__vlan_get_protocol(skb, skb->protocol, &depth))
46
+		if (!vlan_get_protocol_and_depth(skb, skb->protocol, &depth))
51
47
 			goto drop;
52
48
 
53
49
 		skb_set_network_header(skb, depth);
..
..
@@ -173,6 +169,7 @@
173
169
 	struct net_bridge_port *prev, struct net_bridge_port *p,
174
170
 	struct sk_buff *skb, bool local_orig)
175
171
 {
172
+	u8 igmp_type = br_multicast_igmp_type(skb);
176
173
 	int err;
177
174
 
178
175
 	if (!should_deliver(p, skb))
..
..
@@ -184,8 +181,9 @@
184
181
 	err = deliver_clone(prev, skb, local_orig);
185
182
 	if (err)
186
183
 		return ERR_PTR(err);
187
-
188
184
 out:
185
+	br_multicast_count(p->br, p, skb, igmp_type, BR_MCAST_DIR_TX);
186
+
189
187
 	return p;
190
188
 }
191
189
 
..
..
@@ -193,7 +191,6 @@
193
191
 void br_flood(struct net_bridge *br, struct sk_buff *skb,
194
192
 	      enum br_pkt_type pkt_type, bool local_rcv, bool local_orig)
195
193
 {
196
-	u8 igmp_type = br_multicast_igmp_type(skb);
197
194
 	struct net_bridge_port *prev = NULL;
198
195
 	struct net_bridge_port *p;
199
196
 
..
..
@@ -226,9 +223,6 @@
226
223
 		prev = maybe_deliver(prev, p, skb, local_orig);
227
224
 		if (IS_ERR(prev))
228
225
 			goto out;
229
-		if (prev == p)
230
-			br_multicast_count(p->br, p, skb, igmp_type,
231
-					   BR_MCAST_DIR_TX);
232
226
 	}
233
227
 
234
228
 	if (!prev)
..
..
@@ -277,18 +271,26 @@
277
271
 			bool local_rcv, bool local_orig)
278
272
 {
279
273
 	struct net_device *dev = BR_INPUT_SKB_CB(skb)->brdev;
280
-	u8 igmp_type = br_multicast_igmp_type(skb);
281
274
 	struct net_bridge *br = netdev_priv(dev);
282
275
 	struct net_bridge_port *prev = NULL;
283
276
 	struct net_bridge_port_group *p;
277
+	bool allow_mode_include = true;
284
278
 	struct hlist_node *rp;
285
279
 
286
280
 	rp = rcu_dereference(hlist_first_rcu(&br->router_list));
287
-	p = mdst ? rcu_dereference(mdst->ports) : NULL;
281
+	if (mdst) {
282
+		p = rcu_dereference(mdst->ports);
283
+		if (br_multicast_should_handle_mode(br, mdst->addr.proto) &&
284
+		    br_multicast_is_star_g(&mdst->addr))
285
+			allow_mode_include = false;
286
+	} else {
287
+		p = NULL;
288
+	}
289
+
288
290
 	while (p || rp) {
289
291
 		struct net_bridge_port *port, *lport, *rport;
290
292
 
291
-		lport = p ? p->port : NULL;
293
+		lport = p ? p->key.port : NULL;
292
294
 		rport = hlist_entry_safe(rp, struct net_bridge_port, rlist);
293
295
 
294
296
 		if ((unsigned long)lport > (unsigned long)rport) {
..
..
@@ -299,18 +301,18 @@
299
301
 						   local_orig);
300
302
 				goto delivered;
301
303
 			}
304
+			if ((!allow_mode_include &&
305
+			     p->filter_mode == MCAST_INCLUDE) ||
306
+			    (p->flags & MDB_PG_FLAGS_BLOCKED))
307
+				goto delivered;
302
308
 		} else {
303
309
 			port = rport;
304
310
 		}
305
311
 
306
312
 		prev = maybe_deliver(prev, port, skb, local_orig);
307
-delivered:
308
313
 		if (IS_ERR(prev))
309
314
 			goto out;
310
-		if (prev == port)
311
-			br_multicast_count(port->br, port, skb, igmp_type,
312
-					   BR_MCAST_DIR_TX);
313
-
315
+delivered:
314
316
 		if ((unsigned long)lport >= (unsigned long)port)
315
317
 			p = rcu_dereference(p->next);
316
318
 		if ((unsigned long)rport >= (unsigned long)port)