lkml.org 
[lkml]   [2020]   [Jan]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 134/671] ip_tunnel: Fix route fl4 init in ip_md_tunnel_xmit
    Date
    From: wenxu <wenxu@ucloud.cn>

    [ Upstream commit 6e6b904ad4f9aed43ec320afbd5a52ed8461ab41 ]

    Init the gre_key from tuninfo->key.tun_id and init the mark
    from the skb->mark, set the oif to zero in the collect metadata
    mode.

    Fixes: cfc7381b3002 ("ip_tunnel: add collect_md mode to IPIP tunnel")
    Signed-off-by: wenxu <wenxu@ucloud.cn>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/ipv4/ip_tunnel.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c
    index 420e891ac59d..f03a1b68e70f 100644
    --- a/net/ipv4/ip_tunnel.c
    +++ b/net/ipv4/ip_tunnel.c
    @@ -574,8 +574,9 @@ void ip_md_tunnel_xmit(struct sk_buff *skb, struct net_device *dev, u8 proto)
    else if (skb->protocol == htons(ETH_P_IPV6))
    tos = ipv6_get_dsfield((const struct ipv6hdr *)inner_iph);
    }
    - ip_tunnel_init_flow(&fl4, proto, key->u.ipv4.dst, key->u.ipv4.src, 0,
    - RT_TOS(tos), tunnel->parms.link, tunnel->fwmark);
    + ip_tunnel_init_flow(&fl4, proto, key->u.ipv4.dst, key->u.ipv4.src,
    + tunnel_id_to_key32(key->tun_id), RT_TOS(tos),
    + 0, skb->mark);
    if (tunnel->encap.type != TUNNEL_ENCAP_NONE)
    goto tx_error;
    rt = ip_route_output_key(tunnel->net, &fl4);
    --
    2.20.1
    \
     
     \ /
      Last update: 2020-01-16 18:01    [W:2.560 / U:0.204 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site