svn commit: r208194 - stable/8/sys/netipsec
VANHULLEBUS Yvan
vanhu at FreeBSD.org
Mon May 17 15:31:24 UTC 2010
Author: vanhu
Date: Mon May 17 15:31:24 2010
New Revision: 208194
URL: http://svn.freebsd.org/changeset/base/208194
Log:
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
Modified:
stable/8/sys/netipsec/key.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
stable/8/sys/geom/sched/ (props changed)
Modified: stable/8/sys/netipsec/key.c
==============================================================================
--- stable/8/sys/netipsec/key.c Mon May 17 14:27:40 2010 (r208193)
+++ stable/8/sys/netipsec/key.c Mon May 17 15:31:24 2010 (r208194)
@@ -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);
{
More information about the svn-src-stable
mailing list