lkml.org 
[lkml]   [2014]   [Jun]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.10 20/52] ipip, sit: fix ipv4_{update_pmtu,redirect} calls
    Date
    3.10-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Dmitry Popov <ixaphire@qrator.net>

    [ Upstream commit 2346829e641b804ece9ac9298136b56d9567c278 ]

    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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/ipv4/ipip.c | 4 ++--
    net/ipv6/sit.c | 4 ++--
    2 files changed, 4 insertions(+), 4 deletions(-)

    --- a/net/ipv4/ipip.c
    +++ b/net/ipv4/ipip.c
    @@ -149,13 +149,13 @@ static int ipip_err(struct sk_buff *skb,

    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;
    --- a/net/ipv6/sit.c
    +++ b/net/ipv6/sit.c
    @@ -530,12 +530,12 @@ static int ipip6_err(struct sk_buff *skb

    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;



    \
     
     \ /
      Last update: 2014-06-24 19:21    [W:4.222 / U:0.384 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site