lkml.org 
[lkml]   [2020]   [Jan]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 083/104] xfrm: support output_mark for offload ESP packets
    Date
    From: Ulrich Weber <ulrich.weber@gmail.com>

    commit 4e4362d2bf2a49ff44dbbc9585207977ca3d71d0 upstream.

    Commit 9b42c1f179a6 ("xfrm: Extend the output_mark") added output_mark
    support but missed ESP offload support.

    xfrm_smark_get() is not called within xfrm_input() for packets coming
    from esp4_gro_receive() or esp6_gro_receive(). Therefore call
    xfrm_smark_get() directly within these functions.

    Fixes: 9b42c1f179a6 ("xfrm: Extend the output_mark to support input direction and masking.")
    Signed-off-by: Ulrich Weber <ulrich.weber@gmail.com>
    Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    net/ipv4/esp4_offload.c | 2 ++
    net/ipv6/esp6_offload.c | 2 ++
    2 files changed, 4 insertions(+)

    --- a/net/ipv4/esp4_offload.c
    +++ b/net/ipv4/esp4_offload.c
    @@ -57,6 +57,8 @@ static struct sk_buff *esp4_gro_receive(
    if (!x)
    goto out_reset;

    + skb->mark = xfrm_smark_get(skb->mark, x);
    +
    sp->xvec[sp->len++] = x;
    sp->olen++;

    --- a/net/ipv6/esp6_offload.c
    +++ b/net/ipv6/esp6_offload.c
    @@ -79,6 +79,8 @@ static struct sk_buff *esp6_gro_receive(
    if (!x)
    goto out_reset;

    + skb->mark = xfrm_smark_get(skb->mark, x);
    +
    sp->xvec[sp->len++] = x;
    sp->olen++;


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