[src/trunk]: src/sys/netipsec Make sure to sort the list when changing the st...

[ozaki-r <ozaki-r%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/073a585f42a4
branches:  trunk
changeset: 825472:073a585f42a4
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Sun Jul 16 10:46:45 2017 +0000

description:
Make sure to sort the list when changing the state by key_sa_chgstate

diffstat:

 sys/netipsec/key.c |  29 ++++++++++++++++++++++++-----
 1 files changed, 24 insertions(+), 5 deletions(-)

diffs (57 lines):

diff -r 3eab0a7cbc40 -r 073a585f42a4 sys/netipsec/key.c
--- a/sys/netipsec/key.c        Sun Jul 16 10:36:52 2017 +0000
+++ b/sys/netipsec/key.c        Sun Jul 16 10:46:45 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: key.c,v 1.186 2017/07/16 10:36:52 ozaki-r Exp $        */
+/*     $NetBSD: key.c,v 1.187 2017/07/16 10:46:45 ozaki-r Exp $        */
 /*     $FreeBSD: src/sys/netipsec/key.c,v 1.3.2.3 2004/02/14 22:23:23 bms Exp $        */
 /*     $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $   */
 
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.186 2017/07/16 10:36:52 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.187 2017/07/16 10:46:45 ozaki-r Exp $");
 
 /*
  * This code is referd to RFC 2367
@@ -7805,6 +7805,7 @@
 static void
 key_sa_chgstate(struct secasvar *sav, u_int8_t state)
 {
+       struct secasvar *_sav;
 
        KASSERT(sav != NULL);
 
@@ -7815,9 +7816,27 @@
        LIST_REMOVE(sav, chain);
 
        sav->state = state;
-       LIST_INSERT_HEAD(&sav->sah->savtree[state], sav, chain);
-       if (SADB_SASTATE_USABLE_P(sav))
-               key_validate_savlist(sav->sah, state);
+       if (!SADB_SASTATE_USABLE_P(sav)) {
+               /* We don't need to care about the order */
+               LIST_INSERT_HEAD(&sav->sah->savtree[state], sav, chain);
+               return;
+       }
+       /*
+        * Sort the list by lft_c->sadb_lifetime_addtime
+        * in ascending order.
+        */
+       LIST_FOREACH(_sav, &sav->sah->savtree[state], chain) {
+               if (_sav->lft_c->sadb_lifetime_addtime >
+                   sav->lft_c->sadb_lifetime_addtime) {
+                       LIST_INSERT_BEFORE(_sav, sav, chain);
+                       break;
+               }
+       }
+       if (_sav == NULL) {
+               LIST_INSERT_TAIL(&sav->sah->savtree[state], sav, secasvar,
+                   chain);
+       }
+       key_validate_savlist(sav->sah, state);
 }
 
 /* XXX too much? */