[src/trunk]: src/sys/netipsec Convert some sanity checks to CTASSERT

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

details:   https://anonhg.NetBSD.org/src/rev/3d52c21ba63a
branches:  trunk
changeset: 824297:3d52c21ba63a
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Wed May 31 09:51:31 2017 +0000

description:
Convert some sanity checks to CTASSERT

diffstat:

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

diffs (60 lines):

diff -r 6d890a3f8678 -r 3d52c21ba63a sys/netipsec/key.c
--- a/sys/netipsec/key.c        Wed May 31 09:50:04 2017 +0000
+++ b/sys/netipsec/key.c        Wed May 31 09:51:31 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: key.c,v 1.156 2017/05/31 09:50:04 ozaki-r Exp $        */
+/*     $NetBSD: key.c,v 1.157 2017/05/31 09:51:31 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.156 2017/05/31 09:50:04 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.157 2017/05/31 09:51:31 ozaki-r Exp $");
 
 /*
  * This code is referd to RFC 2367
@@ -2215,11 +2215,11 @@
        struct sadb_msg *newmsg;
        int off, len;
 
+       CTASSERT(PFKEY_ALIGN8(sizeof(struct sadb_msg)) <= MCLBYTES);
+
        /* create new sadb_msg to reply. */
        len = PFKEY_ALIGN8(sizeof(struct sadb_msg));
 
-       if (len > MCLBYTES)
-               return key_senderror(so, m, ENOBUFS);
        MGETHDR(n, M_DONTWAIT, MT_DATA);
        if (n && len > MHLEN) {
                MCLGET(n, M_DONTWAIT);
@@ -3798,9 +3798,10 @@
        struct sadb_msg *p;
        int len;
 
+       CTASSERT(PFKEY_ALIGN8(sizeof(struct sadb_msg)) <= MCLBYTES);
+
        len = PFKEY_ALIGN8(sizeof(struct sadb_msg));
-       if (len > MCLBYTES)
-               return NULL;
+
        MGETHDR(m, M_DONTWAIT, MT_DATA);
        if (m && len > MHLEN) {
                MCLGET(m, M_DONTWAIT);
@@ -4934,11 +4935,12 @@
        struct sadb_msg *newmsg;
        int off, len;
 
+       CTASSERT(PFKEY_ALIGN8(sizeof(struct sadb_msg)) +
+           PFKEY_ALIGN8(sizeof(struct sadb_sa)) <= MCLBYTES);
+
        /* create new sadb_msg to reply. */
        len = PFKEY_ALIGN8(sizeof(struct sadb_msg)) +
            PFKEY_ALIGN8(sizeof(struct sadb_sa));
-       if (len > MCLBYTES)
-               return key_senderror(so, m, ENOBUFS);
 
        MGETHDR(n, M_DONTWAIT, MT_DATA);
        if (len > MHLEN) {