Linux Ethernet Bridging - Dec 2012 - [Bridge] [PATCH] bridge: Bug fix for incorrect interpretation of MLDv2 maximum response code

This patch fixes the incorrect interpretation of endianness of MLDv2 maximum
response
code within bridge's multicast snooping code.

Signed-off-by: Ang Way Chuang <wcang at sfc.wide.ad.jp>
---
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 977c3ee..29c6283 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -1172,7 +1172,7 @@ static int br_ip6_multicast_query(struct net_bridge *br,
 		mld2q = (struct mld2_query *)icmp6_hdr(skb);
 		if (!mld2q->mld2q_nsrcs)
 			group = &mld2q->mld2q_mca;
-		max_delay = mld2q->mld2q_mrc ? MLDV2_MRC(mld2q->mld2q_mrc) : 1;
+		max_delay = mld2q->mld2q_mrc ? MLDV2_MRC(ntohs(mld2q->mld2q_mrc)) : 1;
 	}
 
 	if (!group)

On Fri, 14 Dec 2012 08:07:01 +0800
Ang Way Chuang <wcang at sfc.wide.ad.jp> wrote:
> This patch fixes the incorrect interpretation of endianness of MLDv2
maximum response
> code within bridge's multicast snooping code.
> 
> Signed-off-by: Ang Way Chuang <wcang at sfc.wide.ad.jp>
> ---
> diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
> index 977c3ee..29c6283 100644
> --- a/net/bridge/br_multicast.c
> +++ b/net/bridge/br_multicast.c
> @@ -1172,7 +1172,7 @@ static int br_ip6_multicast_query(struct net_bridge
*br,
>  		mld2q = (struct mld2_query *)icmp6_hdr(skb);
>  		if (!mld2q->mld2q_nsrcs)
>  			group = &mld2q->mld2q_mca;
> -		max_delay = mld2q->mld2q_mrc ? MLDV2_MRC(mld2q->mld2q_mrc) : 1;
> +		max_delay = mld2q->mld2q_mrc ? MLDV2_MRC(ntohs(mld2q->mld2q_mrc))
: 1;
>  	}
>  
>  	if (!group)
Already fixed as part of my patch to fix sparse warnings.