Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62457d39 authored by Antony Antony's avatar Antony Antony Committed by Greg Kroah-Hartman
Browse files

xfrm: clone XFRMA_REPLAY_ESN_VAL in xfrm_do_migrate 



[ 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: af2f464e ("xfrm: Assign esn pointers when cloning a state")
Signed-off-by: default avatarAntony Antony <antony.antony@secunet.com>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 9b9dcd96

include/net/xfrm.h

+6 −10
Original line number Diff line number Diff line
@@ -1730,21 +1730,17 @@ static inline int xfrm_replay_state_esn_len(struct xfrm_replay_state_esn *replay 
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;

}