[src/trunk]: src/sys/netipsec Don't release sav if calling crypto_dispatch again

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

details:   https://anonhg.NetBSD.org/src/rev/9f83d3a2580e
branches:  trunk
changeset: 355215:9f83d3a2580e
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Wed Jul 19 09:03:08 2017 +0000

description:
Don't release sav if calling crypto_dispatch again

diffstat:

 sys/netipsec/xform_ah.c     |  5 ++---
 sys/netipsec/xform_esp.c    |  5 ++---
 sys/netipsec/xform_ipcomp.c |  5 ++---
 3 files changed, 6 insertions(+), 9 deletions(-)

diffs (78 lines):

diff -r a8d610565eec -r 9f83d3a2580e sys/netipsec/xform_ah.c
--- a/sys/netipsec/xform_ah.c   Wed Jul 19 07:24:46 2017 +0000
+++ b/sys/netipsec/xform_ah.c   Wed Jul 19 09:03:08 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xform_ah.c,v 1.62 2017/07/18 04:01:04 ozaki-r Exp $    */
+/*     $NetBSD: xform_ah.c,v 1.63 2017/07/19 09:03:08 ozaki-r Exp $    */
 /*     $FreeBSD: src/sys/netipsec/xform_ah.c,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $   */
 /*     $OpenBSD: ip_ah.c,v 1.63 2001/06/26 06:18:58 angelos Exp $ */
 /*
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xform_ah.c,v 1.62 2017/07/18 04:01:04 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_ah.c,v 1.63 2017/07/19 09:03:08 ozaki-r Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
@@ -1209,7 +1209,6 @@
                        sav->tdb_cryptoid = crp->crp_sid;
 
                if (crp->crp_etype == EAGAIN) {
-                       KEY_FREESAV(&sav);
                        mutex_exit(softnet_lock);
                        splx(s);
                        return crypto_dispatch(crp);
diff -r a8d610565eec -r 9f83d3a2580e sys/netipsec/xform_esp.c
--- a/sys/netipsec/xform_esp.c  Wed Jul 19 07:24:46 2017 +0000
+++ b/sys/netipsec/xform_esp.c  Wed Jul 19 09:03:08 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xform_esp.c,v 1.62 2017/07/14 12:26:26 ozaki-r Exp $   */
+/*     $NetBSD: xform_esp.c,v 1.63 2017/07/19 09:03:08 ozaki-r Exp $   */
 /*     $FreeBSD: src/sys/netipsec/xform_esp.c,v 1.2.2.1 2003/01/24 05:11:36 sam Exp $  */
 /*     $OpenBSD: ip_esp.c,v 1.69 2001/06/26 06:18:59 angelos Exp $ */
 
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xform_esp.c,v 1.62 2017/07/14 12:26:26 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_esp.c,v 1.63 2017/07/19 09:03:08 ozaki-r Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
@@ -987,7 +987,6 @@
                        sav->tdb_cryptoid = crp->crp_sid;
 
                if (crp->crp_etype == EAGAIN) {
-                       KEY_FREESAV(&sav);
                        mutex_exit(softnet_lock);
                        splx(s);
                        return crypto_dispatch(crp);
diff -r a8d610565eec -r 9f83d3a2580e sys/netipsec/xform_ipcomp.c
--- a/sys/netipsec/xform_ipcomp.c       Wed Jul 19 07:24:46 2017 +0000
+++ b/sys/netipsec/xform_ipcomp.c       Wed Jul 19 09:03:08 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xform_ipcomp.c,v 1.43 2017/07/14 12:26:26 ozaki-r Exp $        */
+/*     $NetBSD: xform_ipcomp.c,v 1.44 2017/07/19 09:03:08 ozaki-r Exp $        */
 /*     $FreeBSD: src/sys/netipsec/xform_ipcomp.c,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $       */
 /* $OpenBSD: ip_ipcomp.c,v 1.1 2001/07/05 12:08:52 jjbg Exp $ */
 
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xform_ipcomp.c,v 1.43 2017/07/14 12:26:26 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_ipcomp.c,v 1.44 2017/07/19 09:03:08 ozaki-r Exp $");
 
 /* IP payload compression protocol (IPComp), see RFC 2393 */
 #if defined(_KERNEL_OPT)
@@ -554,7 +554,6 @@
                        sav->tdb_cryptoid = crp->crp_sid;
 
                if (crp->crp_etype == EAGAIN) {
-                       KEY_FREESAV(&sav);
                        mutex_exit(softnet_lock);
                        splx(s);
                        return crypto_dispatch(crp);