Re: [PATCH net-next] net: bridge: use mld2r_ngrec instead of icmpv6_dataun
From: Nikolay Aleksandrov <hidden>
Date: 2021-08-28 09:51:47
On 28/08/2021 11:43, shjy180909@gmail.com wrote:
quoted hunk ↗ jump to hunk
From: MichelleJin <redacted> using icmp6h->mld2r_ngrec instead of icmp6h->icmp6_dataun.un_data16[1]. Signed-off-by: MichelleJin <redacted> --- net/bridge/br_multicast.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c index 2c437d4bf632..8e38e02208bd 100644 --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c@@ -2731,8 +2731,8 @@ static int br_ip6_multicast_mld2_report(struct net_bridge_mcast *brmctx, struct net_bridge_mdb_entry *mdst; struct net_bridge_port_group *pg; unsigned int nsrcs_offset; + struct mld2_report *mld2r; const unsigned char *src; - struct icmp6hdr *icmp6h; struct in6_addr *h_addr; struct mld2_grec *grec; unsigned int grec_len;@@ -2740,12 +2740,12 @@ static int br_ip6_multicast_mld2_report(struct net_bridge_mcast *brmctx, int i, len, num; int err = 0; - if (!ipv6_mc_may_pull(skb, sizeof(*icmp6h))) + if (!ipv6_mc_may_pull(skb, sizeof(*mld2r))) return -EINVAL; - icmp6h = icmp6_hdr(skb); - num = ntohs(icmp6h->icmp6_dataun.un_data16[1]); - len = skb_transport_offset(skb) + sizeof(*icmp6h); + mld2r = (struct mld2_report *) icmp6_hdr(skb); + num = ntohs(mld2r->mld2r_ngrec); + len = skb_transport_offset(skb) + sizeof(*mld2r); for (i = 0; i < num; i++) { __be16 *_nsrcs, __nsrcs;
Indeed it should be equivalent, have you run the bridge selftests with this change?