xnu-3789.31.2.tar.gz

[apple/xnu.git] / bsd / netkey / keysock.c

diff --git a/bsd/netkey/keysock.c b/bsd/netkey/keysock.c
index 69c1e92c83041998b2d7bb64f94667fba8e5d788..5502485d32218e8790e506d153c252f810e38979 100644 (file)
--- a/bsd/netkey/keysock.c
+++ b/bsd/netkey/keysock.c
@@ -1,3 +1,31 @@
+/*
+ * Copyright (c) 2016 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ *
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ *
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ *
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
 /*     $KAME: keysock.c,v 1.13 2000/03/25 07:24:13 sumikawa Exp $      */
 
 /*
@@ -161,17 +189,14 @@ end:
  * send message to the socket.
  */
 static int
-key_sendup0(rp, m, promisc)
-       struct rawcb *rp;
-       struct mbuf *m;
-       int promisc;
+key_sendup0(struct rawcb *rp, struct mbuf *m, int promisc)
 {
        int error;
 
        if (promisc) {
                struct sadb_msg *pmsg;
 
-               M_PREPEND(m, sizeof(struct sadb_msg), M_NOWAIT);
+               M_PREPEND(m, sizeof(struct sadb_msg), M_NOWAIT, 1);
                if (m && m->m_len < sizeof(struct sadb_msg))
                        m = m_pullup(m, sizeof(struct sadb_msg));
                if (!m) {
@@ -210,10 +235,7 @@ key_sendup0(rp, m, promisc)
 
 /* so can be NULL if target != KEY_SENDUP_ONE */
 int
-key_sendup_mbuf(so, m, target)
-       struct socket *so;
-       struct mbuf *m;
-       int target;
+key_sendup_mbuf(struct socket *so, struct mbuf *m, int target)
 {
        struct mbuf *n;
        struct keycb *kp;
@@ -358,10 +380,10 @@ key_attach(struct socket *so, int proto, struct proc *p)
 
        if (sotorawcb(so) != 0)
                return EISCONN; /* XXX panic? */
-       kp = (struct keycb *)_MALLOC(sizeof *kp, M_PCB, M_WAITOK); /* XXX */
+       kp = (struct keycb *)_MALLOC(sizeof (*kp), M_PCB,
+           M_WAITOK | M_ZERO); /* XXX */
        if (kp == 0)
                return ENOBUFS;
-       bzero(kp, sizeof *kp);
 
        so->so_pcb = (caddr_t)kp;
        kp->kp_promisc = kp->kp_registered = 0;