From e33d6fbff66f2eccce1a11a22272916f2ec6ae54 Mon Sep 17 00:00:00 2001 From: vanhu Date: Wed, 18 Mar 2009 14:01:41 +0000 Subject: Fixed deletion of sav entries in key_delsah() Approved by: gnn(mentor) Obtained from: NETASQ MFC after: 1 month --- sys/netipsec/key.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'sys/netipsec/key.c') diff --git a/sys/netipsec/key.c b/sys/netipsec/key.c index 74d31dd..7956a8d 100644 --- a/sys/netipsec/key.c +++ b/sys/netipsec/key.c @@ -2687,7 +2687,10 @@ key_delsah(sah) if (sav->refcnt == 0) { /* sanity check */ KEY_CHKSASTATE(state, sav->state, __func__); - KEY_FREESAV(&sav); + /* do NOT call KEY_FREESAV here: it will only delete the sav if refcnt == 1, + * where we already know that refcnt == 0 + */ + key_delsav(sav); } else { /* give up to delete this sa */ zombie++; @@ -4131,6 +4134,8 @@ key_flush_sad(time_t now) /* if LARVAL entry doesn't become MATURE, delete it. */ LIST_FOREACH_SAFE(sav, &sah->savtree[SADB_SASTATE_LARVAL], chain, nextsav) { + /* Need to also check refcnt for a larval SA ??? + */ if (now - sav->created > V_key_larval_lifetime) KEY_FREESAV(&sav); } -- cgit v1.1