summarylogtreecommitdiffstats
path: root/0001-fix-bridge-regression.patch
diff options
context:
space:
mode:
Diffstat (limited to '0001-fix-bridge-regression.patch')
-rw-r--r--0001-fix-bridge-regression.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/0001-fix-bridge-regression.patch b/0001-fix-bridge-regression.patch
new file mode 100644
index 000000000000..250dfcbcfbf8
--- /dev/null
+++ b/0001-fix-bridge-regression.patch
@@ -0,0 +1,25 @@
+@@ -, +, @@
+---
+ net/bridge/br_multicast.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+--- a/net/bridge/br_multicast.c
++++ a/net/bridge/br_multicast.c
+@@ -991,7 +991,7 @@ static int br_ip4_multicast_igmp3_report(struct net_bridge *br,
+
+ ih = igmpv3_report_hdr(skb);
+ num = ntohs(ih->ngrec);
+- len = sizeof(*ih);
++ len = skb_transport_offset(skb) + sizeof(*ih);
+
+ for (i = 0; i < num; i++) {
+ len += sizeof(*grec);
+@@ -1052,7 +1052,7 @@ static int br_ip6_multicast_mld2_report(struct net_bridge *br,
+
+ icmp6h = icmp6_hdr(skb);
+ num = ntohs(icmp6h->icmp6_dataun.un_data16[1]);
+- len = sizeof(*icmp6h);
++ len = skb_transport_offset(skb) + sizeof(*icmp6h);
+
+ for (i = 0; i < num; i++) {
+ __be16 *nsrcs, _nsrcs;
+--