Module Name: src
Committed By: ozaki-r
Date: Wed Apr 19 07:14:45 UTC 2017
Modified Files:
src/sys/netipsec: ipsec.c
Log Message:
Change ifdef DIAGNOSTIC + panic to KASSERT
To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/sys/netipsec/ipsec.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/ipsec.c
diff -u src/sys/netipsec/ipsec.c:1.78 src/sys/netipsec/ipsec.c:1.79
--- src/sys/netipsec/ipsec.c:1.78 Wed Apr 19 03:43:34 2017
+++ src/sys/netipsec/ipsec.c Wed Apr 19 07:14:45 2017
@@ -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 @@ ipsec_fillpcbcache(struct inpcbpolicy *p
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);
