xnu-792.6.56.tar.gz

[apple/xnu.git] / bsd / kern / kern_control.c

diff --git a/bsd/kern/kern_control.c b/bsd/kern/kern_control.c
index 955bbd3751098e397d346e57f626dc7961de2c9e..3bf93570816e9396ca736fd2b76229725632f03a 100644 (file)
--- a/bsd/kern/kern_control.c
+++ b/bsd/kern/kern_control.c
@@ -3,19 +3,20 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 

- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * 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. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * 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_LICENSE_HEADER_END@
  */
  * 
  * @APPLE_LICENSE_HEADER_END@
  */


@@ -637,6 +638,8 @@ ctl_ctloutput(struct socket *so, struct sockopt *sopt)
                                MALLOC(data, void *, sopt->sopt_valsize, M_TEMP, M_WAITOK);
                                if (data == NULL)
                                        return(ENOMEM);
                                MALLOC(data, void *, sopt->sopt_valsize, M_TEMP, M_WAITOK);
                                if (data == NULL)
                                        return(ENOMEM);

+                               /* 4108337 - copy in data for get socket option */
+                               error = sooptcopyin(sopt, data, sopt->sopt_valsize, sopt->sopt_valsize);

                        }
                        len = sopt->sopt_valsize;
                        socket_unlock(so, 0);
                        }
                        len = sopt->sopt_valsize;
                        socket_unlock(so, 0);


@@ -770,7 +773,7 @@ ctl_register(struct kern_ctl_reg *userkctl, kern_ctl_ref *kctlref)
                userkctl->ctl_sendsize = CTL_SENDSIZE;
        kctl->sendbufsize = userkctl->ctl_sendsize;
 
                userkctl->ctl_sendsize = CTL_SENDSIZE;
        kctl->sendbufsize = userkctl->ctl_sendsize;
 

-       if (kctl->recvbufsize == 0)
+       if (userkctl->ctl_recvsize == 0)

                userkctl->ctl_recvsize = CTL_RECVSIZE;
        kctl->recvbufsize = userkctl->ctl_recvsize;
 
                userkctl->ctl_recvsize = CTL_RECVSIZE;
        kctl->recvbufsize = userkctl->ctl_recvsize;