Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2346829e authored Jun 06, 2014 by Dmitry Popov Committed by David S. Miller Jun 10, 2014

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>

parent 87757a91

net/ipv4/ipip.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -149,13 +149,13 @@ static int ipip_err(struct sk_buff *skb, u32 info)

		if (type == ICMP_DEST_UNREACH && code == ICMP_FRAG_NEEDED) {
		ipv4_update_pmtu(skb, dev_net(skb->dev), info,
		t->dev->ifindex, 0, IPPROTO_IPIP, 0);
		t->parms.link, 0, IPPROTO_IPIP, 0);
		err = 0;
		goto out;
		}

		if (type == ICMP_REDIRECT) {
		ipv4_redirect(skb, dev_net(skb->dev), t->dev->ifindex, 0,
		ipv4_redirect(skb, dev_net(skb->dev), t->parms.link, 0,
		IPPROTO_IPIP, 0);
		err = 0;
		goto out;

net/ipv6/sit.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -560,12 +560,12 @@ static int ipip6_err(struct sk_buff *skb, u32 info)

		if (type == ICMP_DEST_UNREACH && code == ICMP_FRAG_NEEDED) {
		ipv4_update_pmtu(skb, dev_net(skb->dev), info,
		t->dev->ifindex, 0, IPPROTO_IPV6, 0);
		t->parms.link, 0, IPPROTO_IPV6, 0);
		err = 0;
		goto out;
		}
		if (type == ICMP_REDIRECT) {
		ipv4_redirect(skb, dev_net(skb->dev), t->dev->ifindex, 0,
		ipv4_redirect(skb, dev_net(skb->dev), t->parms.link, 0,
		IPPROTO_IPV6, 0);
		err = 0;
		goto out;