lkml.org 
[lkml]   [2020]   [May]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 28/80] xfrm: Always set XFRM_TRANSFORMED in xfrm{4,6}_output_finish
    Date
    From: David Ahern <dsahern@gmail.com>

    [ Upstream commit 0c922a4850eba2e668f73a3f1153196e09abb251 ]

    IPSKB_XFRM_TRANSFORMED and IP6SKB_XFRM_TRANSFORMED are skb flags set by
    xfrm code to tell other skb handlers that the packet has been passed
    through the xfrm output functions. Simplify the code and just always
    set them rather than conditionally based on netfilter enabled thus
    making the flag available for other users.

    Signed-off-by: David Ahern <dsahern@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/ipv4/xfrm4_output.c | 2 --
    net/ipv6/xfrm6_output.c | 2 --
    2 files changed, 4 deletions(-)

    --- a/net/ipv4/xfrm4_output.c
    +++ b/net/ipv4/xfrm4_output.c
    @@ -75,9 +75,7 @@ int xfrm4_output_finish(struct sock *sk,
    {
    memset(IPCB(skb), 0, sizeof(*IPCB(skb)));

    -#ifdef CONFIG_NETFILTER
    IPCB(skb)->flags |= IPSKB_XFRM_TRANSFORMED;
    -#endif

    return xfrm_output(sk, skb);
    }
    --- a/net/ipv6/xfrm6_output.c
    +++ b/net/ipv6/xfrm6_output.c
    @@ -125,9 +125,7 @@ int xfrm6_output_finish(struct sock *sk,
    {
    memset(IP6CB(skb), 0, sizeof(*IP6CB(skb)));

    -#ifdef CONFIG_NETFILTER
    IP6CB(skb)->flags |= IP6SKB_XFRM_TRANSFORMED;
    -#endif

    return xfrm_output(sk, skb);
    }

    \
     
     \ /
      Last update: 2020-05-01 15:29    [W:4.321 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site