summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorSteffen Klassert <steffen.klassert@secunet.com>2011-03-28 19:46:39 +0000
committerDavid S. Miller <davem@davemloft.net>2011-03-28 23:34:52 -0700
commitaf2f464e326ebad57284cfdecb03f1606e89bbc7 (patch)
tree0b9f1e9918a47f49e1454a0df5e045a0d627050d /net
parent36ae0148dbb6b9e15d8f067bb7523fd2b765a6af (diff)
downloadop-kernel-dev-af2f464e326ebad57284cfdecb03f1606e89bbc7.zip
op-kernel-dev-af2f464e326ebad57284cfdecb03f1606e89bbc7.tar.gz
xfrm: Assign esn pointers when cloning a state
When we clone a xfrm state we have to assign the replay_esn and the preplay_esn pointers to the state if we use the new replay detection method. To this end, we add a xfrm_replay_clone() function that allocates memory for the replay detection and takes over the necessary values from the original state. Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com> Acked-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/xfrm/xfrm_state.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index f83a3d1..dd78536 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -1181,6 +1181,12 @@ static struct xfrm_state *xfrm_state_clone(struct xfrm_state *orig, int *errp)
goto error;
}
+ if (orig->replay_esn) {
+ err = xfrm_replay_clone(x, orig);
+ if (err)
+ goto error;
+ }
+
memcpy(&x->mark, &orig->mark, sizeof(x->mark));
err = xfrm_init_state(x);
OpenPOWER on IntegriCloud