Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/netipsec Change ifdef DIAGNOSTIC + panic to KASSERT



details:   https://anonhg.NetBSD.org/src/rev/934a03243d69
branches:  trunk
changeset: 823326:934a03243d69
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Wed Apr 19 07:14:45 2017 +0000

description:
Change ifdef DIAGNOSTIC + panic to KASSERT

diffstat:

 sys/netipsec/ipsec.c |  10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diffs (31 lines):

diff -r dfd80620e1d1 -r 934a03243d69 sys/netipsec/ipsec.c
--- a/sys/netipsec/ipsec.c      Wed Apr 19 06:54:14 2017 +0000
+++ b/sys/netipsec/ipsec.c      Wed Apr 19 07:14:45 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ipsec.c,v 1.78 2017/04/19 03:43:34 ozaki-r Exp $       */
+/*     $NetBSD: ipsec.c,v 1.79 2017/04/19 07:14:45 ozaki-r Exp $       */
 /*     $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netipsec/ipsec.c,v 1.2.2.2 2003/07/01 01:38:13 sam Exp $       */
 /*     $KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $ */
 
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.78 2017/04/19 03:43:34 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.79 2017/04/19 07:14:45 ozaki-r Exp $");
 
 /*
  * IPsec controller part.
@@ -283,10 +283,8 @@
        default:
                return EINVAL;
        }
-#ifdef DIAGNOSTIC
-       if (dir >= sizeof(pcbsp->sp_cache)/sizeof(pcbsp->sp_cache[0]))
-               panic("dir too big in ipsec_fillpcbcache");
-#endif
+
+       KASSERT(dir < sizeof(pcbsp->sp_cache)/sizeof(pcbsp->sp_cache[0]));
 
        if (pcbsp->sp_cache[dir].cachesp)
                KEY_FREESP(&pcbsp->sp_cache[dir].cachesp);



Home | Main Index | Thread Index | Old Index