lkml.org 
[lkml]   [2020]   [Oct]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 49/85] xfrm: clone XFRMA_SET_MARK in xfrm_do_migrate
    Date
    From: Antony Antony <antony.antony@secunet.com>

    [ Upstream commit 545e5c571662b1cd79d9588f9d3b6e36985b8007 ]

    XFRMA_SET_MARK and XFRMA_SET_MARK_MASK was not cloned from the old
    to the new. Migrate these two attributes during XFRMA_MSG_MIGRATE

    Fixes: 9b42c1f179a6 ("xfrm: Extend the output_mark to support input direction and masking.")
    Signed-off-by: Antony Antony <antony.antony@secunet.com>
    Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/xfrm/xfrm_state.c | 1 +
    1 file changed, 1 insertion(+)

    diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
    index f3423562d9336..10d30f0338d72 100644
    --- a/net/xfrm/xfrm_state.c
    +++ b/net/xfrm/xfrm_state.c
    @@ -1507,6 +1507,7 @@ static struct xfrm_state *xfrm_state_clone(struct xfrm_state *orig,
    }

    memcpy(&x->mark, &orig->mark, sizeof(x->mark));
    + memcpy(&x->props.smark, &orig->props.smark, sizeof(x->props.smark));

    if (xfrm_init_state(x) < 0)
    goto error;
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-10-12 15:45    [W:2.918 / U:0.628 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site