From 8bca11513bec04b329a7ce2c4feae120d3175694 Mon Sep 17 00:00:00 2001 From: vanhu Date: Mon, 17 May 2010 15:31:24 +0000 Subject: MFC: Locks SPTREE when setting some SP entries to state DEAD. This can prevent kernel panics when updating SPs while there is some traffic for them. Obtained from: NETASQ --- sys/netipsec/key.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'sys/netipsec') diff --git a/sys/netipsec/key.c b/sys/netipsec/key.c index b43acb8..71e1249 100644 --- a/sys/netipsec/key.c +++ b/sys/netipsec/key.c @@ -1882,7 +1882,9 @@ key_spdadd(so, m, mhp) newsp = key_getsp(&spidx); if (mhp->msg->sadb_msg_type == SADB_X_SPDUPDATE) { if (newsp) { + SPTREE_LOCK(); newsp->state = IPSEC_SPSTATE_DEAD; + SPTREE_UNLOCK(); KEY_FREESP(&newsp); } } else { @@ -2127,7 +2129,9 @@ key_spddelete(so, m, mhp) /* save policy id to buffer to be returned. */ xpl0->sadb_x_policy_id = sp->id; + SPTREE_LOCK(); sp->state = IPSEC_SPSTATE_DEAD; + SPTREE_UNLOCK(); KEY_FREESP(&sp); { @@ -2194,7 +2198,9 @@ key_spddelete2(so, m, mhp) return key_senderror(so, m, EINVAL); } + SPTREE_LOCK(); sp->state = IPSEC_SPSTATE_DEAD; + SPTREE_UNLOCK(); KEY_FREESP(&sp); { -- cgit v1.1