diff options
| author | Ulrich Weber <ulrich.weber@sophos.com> | 2012-03-05 04:52:44 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-03-05 16:45:34 -0500 |
| commit | d1d81d4c3dd886d5fa25a2c4fa1e39cb89613712 (patch) | |
| tree | 8b9ee1f86fa66efeaa58f033a0e0c330c5c43139 | |
| parent | a4b64fbe482c7766f7925f03067fc637716bfa3f (diff) | |
| download | op-kernel-dev-d1d81d4c3dd886d5fa25a2c4fa1e39cb89613712.zip op-kernel-dev-d1d81d4c3dd886d5fa25a2c4fa1e39cb89613712.tar.gz | |
bridge: check return value of ipv6_dev_get_saddr()
otherwise source IPv6 address of ICMPV6_MGM_QUERY packet
might be random junk if IPv6 is disabled on interface or
link-local address is not yet ready (DAD).
Signed-off-by: Ulrich Weber <ulrich.weber@sophos.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/bridge/br_multicast.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c index 568d5bf..702a1ae 100644 --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c @@ -446,8 +446,11 @@ static struct sk_buff *br_ip6_multicast_alloc_query(struct net_bridge *br, ip6h->nexthdr = IPPROTO_HOPOPTS; ip6h->hop_limit = 1; ipv6_addr_set(&ip6h->daddr, htonl(0xff020000), 0, 0, htonl(1)); - ipv6_dev_get_saddr(dev_net(br->dev), br->dev, &ip6h->daddr, 0, - &ip6h->saddr); + if (ipv6_dev_get_saddr(dev_net(br->dev), br->dev, &ip6h->daddr, 0, + &ip6h->saddr)) { + kfree_skb(skb); + return NULL; + } ipv6_eth_mc_map(&ip6h->daddr, eth->h_dest); hopopt = (u8 *)(ip6h + 1); |
