Module Name: src Committed By: ozaki-r Date: Sun Jul 16 10:36:52 UTC 2017
Modified Files: src/sys/netipsec: key.c Log Message: Don't validate sav lists of LARVAL or DEAD states We don't sort the lists so the validation will always fail. Fix PR kern/52405 To generate a diff of this commit: cvs rdiff -u -r1.185 -r1.186 src/sys/netipsec/key.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/netipsec/key.c diff -u src/sys/netipsec/key.c:1.185 src/sys/netipsec/key.c:1.186 --- src/sys/netipsec/key.c:1.185 Sat Jul 15 22:48:32 2017 +++ src/sys/netipsec/key.c Sun Jul 16 10:36:52 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: key.c,v 1.185 2017/07/15 22:48:32 christos Exp $ */ +/* $NetBSD: key.c,v 1.186 2017/07/16 10:36:52 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.185 2017/07/15 22:48:32 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.186 2017/07/16 10:36:52 ozaki-r Exp $"); /* * This code is referd to RFC 2367 @@ -7816,7 +7816,8 @@ key_sa_chgstate(struct secasvar *sav, u_ sav->state = state; LIST_INSERT_HEAD(&sav->sah->savtree[state], sav, chain); - key_validate_savlist(sav->sah, state); + if (SADB_SASTATE_USABLE_P(sav)) + key_validate_savlist(sav->sah, state); } /* XXX too much? */