aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Lüssing <linus.luessing@web.de>2011-02-15 13:19:19 +0000
committerDavid S. Miller <davem@davemloft.net>2011-02-22 10:07:27 -0800
commitd41db9f3f71548f07b8b6d81a88220d0035b04f6 (patch)
tree14d56a73bccb0fdc6a00a79809fec94697817f6d
parent649e984d00416cb1a254fdbebd6d3f9fa01c32fa (diff)
downloadkernel_samsung_espresso10-d41db9f3f71548f07b8b6d81a88220d0035b04f6.zip
kernel_samsung_espresso10-d41db9f3f71548f07b8b6d81a88220d0035b04f6.tar.gz
kernel_samsung_espresso10-d41db9f3f71548f07b8b6d81a88220d0035b04f6.tar.bz2
bridge: Add missing ntohs()s for MLDv2 report parsing
The nsrcs number is 2 Byte wide, therefore we need to call ntohs() before using it. Signed-off-by: Linus Lüssing <linus.luessing@web.de> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/bridge/br_multicast.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index d69beaf..9ce2af1 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -1020,11 +1020,12 @@ static int br_ip6_multicast_mld2_report(struct net_bridge *br,
if (!pskb_may_pull(skb,
len + sizeof(*grec) +
- sizeof(struct in6_addr) * (*nsrcs)))
+ sizeof(struct in6_addr) * ntohs(*nsrcs)))
return -EINVAL;
grec = (struct mld2_grec *)(skb->data + len);
- len += sizeof(*grec) + sizeof(struct in6_addr) * (*nsrcs);
+ len += sizeof(*grec) +
+ sizeof(struct in6_addr) * ntohs(*nsrcs);
/* We treat these as MLDv1 reports for now. */
switch (grec->grec_type) {