xnu-517.9.5.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 7319540f53e19ec32f96b721774c1ef7a39c7c45..d57e838513f099f8cac26ae99744474c3e8c6b4a 100644 (file)
--- a/bsd/kern/kern_control.c
+++ b/bsd/kern/kern_control.c
@@ -3,22 +3,19 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 

- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 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.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE 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@
  */


@@ -168,6 +165,13 @@ ctl_connect(struct socket *so, struct sockaddr *nam, struct proc *p)
     if (ctl == NULL)
         return(EADDRNOTAVAIL);
 
     if (ctl == NULL)
         return(EADDRNOTAVAIL);
 

+    if (ctl->flags & CTL_FLAG_PRIVILEGED) {
+        if (p == 0)
+            return(EINVAL);
+        if (error = suser(p->p_ucred, &p->p_acflag))
+            return error;
+    }
+

     if (ctl->skt != NULL)
         return(EBUSY);
 
     if (ctl->skt != NULL)
         return(EBUSY);
 


@@ -179,13 +183,6 @@ ctl_connect(struct socket *so, struct sockaddr *nam, struct proc *p)
     
     ctl->skt = so;
     
     
     ctl->skt = so;
     

-    if (ctl->flags & CTL_FLAG_PRIVILEGED) {
-        if (p == 0)
-            return(EPERM);
-        if (error = suser(p->p_ucred, &p->p_acflag))
-            return error;
-    }
-    

     if (ctl->connect)
         error = (*ctl->connect)(ctl, ctl->userdata);
     if (error) {
     if (ctl->connect)
         error = (*ctl->connect)(ctl, ctl->userdata);
     if (error) {


@@ -284,7 +281,8 @@ ctl_enqueuedata(void *ctlref, void *data, size_t len, u_int32_t flags)
     }
 
     bcopy(data, mtod(m, void *), len);
     }
 
     bcopy(data, mtod(m, void *), len);

-    
+    m->m_pkthdr.len = m->m_len = len;
+

     sbappend(&so->so_rcv, m);
     if ((flags & CTL_DATA_NOWAKEUP) == 0)
         sorwakeup(so);
     sbappend(&so->so_rcv, m);
     if ((flags & CTL_DATA_NOWAKEUP) == 0)
         sorwakeup(so);