[src/trunk]: src/sys/netipsec Hold key_sad.lock on SAVLIST_WRITER_INSERT_TAIL

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

details:   https://anonhg.NetBSD.org/src/rev/e9c001ad5b3d
branches:  trunk
changeset: 355632:e9c001ad5b3d
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Mon Aug 07 07:45:45 2017 +0000

description:
Hold key_sad.lock on SAVLIST_WRITER_INSERT_TAIL

diffstat:

 sys/netipsec/key.c |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (38 lines):

diff -r db0550674adc -r e9c001ad5b3d sys/netipsec/key.c
--- a/sys/netipsec/key.c        Mon Aug 07 06:53:48 2017 +0000
+++ b/sys/netipsec/key.c        Mon Aug 07 07:45:45 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: key.c,v 1.211 2017/08/07 03:30:45 ozaki-r Exp $        */
+/*     $NetBSD: key.c,v 1.212 2017/08/07 07:45: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.211 2017/08/07 03:30:45 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.212 2017/08/07 07:45:45 ozaki-r Exp $");
 
 /*
  * This code is referd to RFC 2367
@@ -5453,7 +5453,9 @@
        newsav->refcnt = 1;
        newsav->state = SADB_SASTATE_MATURE;
        SAVLIST_ENTRY_INIT(newsav);
+       mutex_enter(&key_sad.lock);
        SAVLIST_WRITER_INSERT_TAIL(sah, SADB_SASTATE_MATURE, newsav);
+       mutex_exit(&key_sad.lock);
        key_validate_savlist(sah, SADB_SASTATE_MATURE);
 
        key_sa_chgstate(sav, SADB_SASTATE_DEAD);
@@ -5644,7 +5646,9 @@
        newsav->refcnt = 1;
        newsav->state = SADB_SASTATE_MATURE;
        SAVLIST_ENTRY_INIT(newsav);
+       mutex_enter(&key_sad.lock);
        SAVLIST_WRITER_INSERT_TAIL(sah, SADB_SASTATE_MATURE, newsav);
+       mutex_exit(&key_sad.lock);
        key_validate_savlist(sah, SADB_SASTATE_MATURE);
 
        /*