lkml.org 
[lkml]   [2016]   [Dec]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 26/38] ipv4: Set skb->protocol properly for local output
    Date
    From: Eli Cooper <elicooper@gmx.com>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    commit f4180439109aa720774baafdd798b3234ab1a0d2 upstream.

    When xfrm is applied to TSO/GSO packets, it follows this path:

    xfrm_output() -> xfrm_output_gso() -> skb_gso_segment()

    where skb_gso_segment() relies on skb->protocol to function properly.

    This patch sets skb->protocol to ETH_P_IP before dst_output() is called,
    fixing a bug where GSO packets sent through a sit tunnel are dropped
    when xfrm is involved.

    Signed-off-by: Eli Cooper <elicooper@gmx.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    ---
    net/ipv4/ip_output.c | 3 +++
    1 file changed, 3 insertions(+)

    diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
    index b4cdc79a7fc8..e6353e25cf03 100644
    --- a/net/ipv4/ip_output.c
    +++ b/net/ipv4/ip_output.c
    @@ -97,6 +97,9 @@ int __ip_local_out(struct sk_buff *skb)

    iph->tot_len = htons(skb->len);
    ip_send_check(iph);
    +
    + skb->protocol = htons(ETH_P_IP);
    +
    return nf_hook(NFPROTO_IPV4, NF_INET_LOCAL_OUT, skb, NULL,
    skb_dst(skb)->dev, dst_output);
    }
    --
    2.11.0
    \
     
     \ /
      Last update: 2016-12-13 20:56    [W:2.911 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site