[XFRM]: Fix OOPS in xfrm_state_update.

edba1f10 · Herbert Xu · David S. Miller · 41f0321d · edba1f10
Commit edba1f10 authored Aug 02, 2003 by Herbert Xu Committed by David S. Miller Aug 02, 2003
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

net/xfrm/xfrm_state.c net/xfrm/xfrm_state.c +2 -1

No files found.
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -485,6 +485,7 @@ int xfrm_state_update(struct xfrm_state *x)
 	err = -EINVAL;
 	spin_lock_bh(&x1->lock);
 	if (likely(x1->km.state == XFRM_STATE_VALID)) {
+		if (x->encap && x1->encap)
 			memcpy(x1->encap, x->encap, sizeof(*x1->encap));
 		memcpy(&x1->lft, &x->lft, sizeof(x1->lft));
 		x1->km.dying = 0;