| Message ID | 1267624874-22326-1-git-send-email-timo.teras@iki.fi |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Timo Teras <timo.teras@iki.fi> Date: Wed, 3 Mar 2010 16:01:13 +0200 > ipgre_header() can be called with zero daddr when the gre device is > configured as multipoint tunnel and still has the NOARP flag set (which is > typically cleared by the userspace arp daemon). If the NOARP packets are > not dropped, ipgre_tunnel_xmit() will take rt->rt_gateway (= NBMA IP) and > use that for route look up (and may lead to bogus xfrm acquires). > > The multicast address check is removed as sending to multicast group should > be ok. In fact, if gre device has a multicast address as destination > ipgre_header is always called with multicast address. > > Signed-off-by: Timo Teras <timo.teras@iki.fi> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index c0c5274..f47c9f7 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -1144,12 +1144,9 @@ static int ipgre_header(struct sk_buff *skb, struct net_device *dev, if (saddr) memcpy(&iph->saddr, saddr, 4); - - if (daddr) { + if (daddr) memcpy(&iph->daddr, daddr, 4); - return t->hlen; - } - if (iph->daddr && !ipv4_is_multicast(iph->daddr)) + if (iph->daddr) return t->hlen; return -t->hlen;
ipgre_header() can be called with zero daddr when the gre device is configured as multipoint tunnel and still has the NOARP flag set (which is typically cleared by the userspace arp daemon). If the NOARP packets are not dropped, ipgre_tunnel_xmit() will take rt->rt_gateway (= NBMA IP) and use that for route look up (and may lead to bogus xfrm acquires). The multicast address check is removed as sending to multicast group should be ok. In fact, if gre device has a multicast address as destination ipgre_header is always called with multicast address. Signed-off-by: Timo Teras <timo.teras@iki.fi> --- net/ipv4/ip_gre.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-)