diff options
author | Dmitry Popov <ixaphire@qrator.net> | 2014-06-06 15:19:21 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-06-11 02:35:52 -0400 |
commit | 2346829e641b804ece9ac9298136b56d9567c278 (patch) | |
tree | 4f10815236c30fbcd7da844848e5d421e34bb758 | |
parent | 87757a917b0b3c0787e0563c679762152be81312 (diff) |
ipip, sit: fix ipv4_{update_pmtu,redirect} calls
ipv4_{update_pmtu,redirect} were called with tunnel's ifindex (t->dev is a
tunnel netdevice). It caused wrong route lookup and failure of pmtu update or
redirect. We should use the same ifindex that we use in ip_route_output_* in
*tunnel_xmit code. It is t->parms.link .
Signed-off-by: Dmitry Popov <ixaphire@qrator.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/ipv4/ipip.c | 4 | ||||
-rw-r--r-- | net/ipv6/sit.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c index 812b18351462..09680ddbc677 100644 --- a/net/ipv4/ipip.c +++ b/net/ipv4/ipip.c | |||
@@ -149,13 +149,13 @@ static int ipip_err(struct sk_buff *skb, u32 info) | |||
149 | 149 | ||
150 | if (type == ICMP_DEST_UNREACH && code == ICMP_FRAG_NEEDED) { | 150 | if (type == ICMP_DEST_UNREACH && code == ICMP_FRAG_NEEDED) { |
151 | ipv4_update_pmtu(skb, dev_net(skb->dev), info, | 151 | ipv4_update_pmtu(skb, dev_net(skb->dev), info, |
152 | t->dev->ifindex, 0, IPPROTO_IPIP, 0); | 152 | t->parms.link, 0, IPPROTO_IPIP, 0); |
153 | err = 0; | 153 | err = 0; |
154 | goto out; | 154 | goto out; |
155 | } | 155 | } |
156 | 156 | ||
157 | if (type == ICMP_REDIRECT) { | 157 | if (type == ICMP_REDIRECT) { |
158 | ipv4_redirect(skb, dev_net(skb->dev), t->dev->ifindex, 0, | 158 | ipv4_redirect(skb, dev_net(skb->dev), t->parms.link, 0, |
159 | IPPROTO_IPIP, 0); | 159 | IPPROTO_IPIP, 0); |
160 | err = 0; | 160 | err = 0; |
161 | goto out; | 161 | goto out; |
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index e5a453ca302e..45397b2a4a0b 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c | |||
@@ -560,12 +560,12 @@ static int ipip6_err(struct sk_buff *skb, u32 info) | |||
560 | 560 | ||
561 | if (type == ICMP_DEST_UNREACH && code == ICMP_FRAG_NEEDED) { | 561 | if (type == ICMP_DEST_UNREACH && code == ICMP_FRAG_NEEDED) { |
562 | ipv4_update_pmtu(skb, dev_net(skb->dev), info, | 562 | ipv4_update_pmtu(skb, dev_net(skb->dev), info, |
563 | t->dev->ifindex, 0, IPPROTO_IPV6, 0); | 563 | t->parms.link, 0, IPPROTO_IPV6, 0); |
564 | err = 0; | 564 | err = 0; |
565 | goto out; | 565 | goto out; |
566 | } | 566 | } |
567 | if (type == ICMP_REDIRECT) { | 567 | if (type == ICMP_REDIRECT) { |
568 | ipv4_redirect(skb, dev_net(skb->dev), t->dev->ifindex, 0, | 568 | ipv4_redirect(skb, dev_net(skb->dev), t->parms.link, 0, |
569 | IPPROTO_IPV6, 0); | 569 | IPPROTO_IPV6, 0); |
570 | err = 0; | 570 | err = 0; |
571 | goto out; | 571 | goto out; |