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.8 054/124] xfrm: clone XFRMA_REPLAY_ESN_VAL in xfrm_do_migrate
    Date
    From: Antony Antony <antony.antony@secunet.com>

    [ Upstream commit 91a46c6d1b4fcbfa4773df9421b8ad3e58088101 ]

    XFRMA_REPLAY_ESN_VAL was not cloned completely from the old to the new.
    Migrate this attribute during XFRMA_MSG_MIGRATE

    v1->v2:
    - move curleft cloning to a separate patch

    Fixes: af2f464e326e ("xfrm: Assign esn pointers when cloning a state")
    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>
    ---
    include/net/xfrm.h | 16 ++++++----------
    1 file changed, 6 insertions(+), 10 deletions(-)

    diff --git a/include/net/xfrm.h b/include/net/xfrm.h
    index 51f65d23ebafa..2e32cb10ac16b 100644
    --- a/include/net/xfrm.h
    +++ b/include/net/xfrm.h
    @@ -1767,21 +1767,17 @@ static inline unsigned int xfrm_replay_state_esn_len(struct xfrm_replay_state_es
    static inline int xfrm_replay_clone(struct xfrm_state *x,
    struct xfrm_state *orig)
    {
    - x->replay_esn = kzalloc(xfrm_replay_state_esn_len(orig->replay_esn),
    +
    + x->replay_esn = kmemdup(orig->replay_esn,
    + xfrm_replay_state_esn_len(orig->replay_esn),
    GFP_KERNEL);
    if (!x->replay_esn)
    return -ENOMEM;
    -
    - x->replay_esn->bmp_len = orig->replay_esn->bmp_len;
    - x->replay_esn->replay_window = orig->replay_esn->replay_window;
    -
    - x->preplay_esn = kmemdup(x->replay_esn,
    - xfrm_replay_state_esn_len(x->replay_esn),
    + x->preplay_esn = kmemdup(orig->preplay_esn,
    + xfrm_replay_state_esn_len(orig->preplay_esn),
    GFP_KERNEL);
    - if (!x->preplay_esn) {
    - kfree(x->replay_esn);
    + if (!x->preplay_esn)
    return -ENOMEM;
    - }

    return 0;
    }
    --
    2.25.1


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