* [PATCH] bridge: check return value of ipv6_dev_get_saddr()
@ 2012-03-05 14:52 Ulrich Weber
2012-03-05 21:45 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Ulrich Weber @ 2012-03-05 14:52 UTC (permalink / raw)
To: davem; +Cc: netdev
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>
---
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);
--
1.7.4.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] bridge: check return value of ipv6_dev_get_saddr()
2012-03-05 14:52 [PATCH] bridge: check return value of ipv6_dev_get_saddr() Ulrich Weber
@ 2012-03-05 21:45 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2012-03-05 21:45 UTC (permalink / raw)
To: ulrich.weber; +Cc: netdev
From: Ulrich Weber <ulrich.weber@Sophos.com>
Date: Mon, 5 Mar 2012 15:52:44 +0100
> 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>
Applied and queued up for -stable, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-03-05 21:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-05 14:52 [PATCH] bridge: check return value of ipv6_dev_get_saddr() Ulrich Weber
2012-03-05 21:45 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).