Commit 50e11792 authored Sep 04, 2020 by Antony Antony Committed by Greg Kroah-Hartman Oct 14, 2020

xfrm: clone XFRMA_SET_MARK in xfrm_do_migrate



[ 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: 9b42c1f1 ("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>

parent a1491a65

net/xfrm/xfrm_state.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -1410,6 +1410,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;