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 6e3288a6ab979dda7aef7786872aa132e90bd624..d57e838513f099f8cac26ae99744474c3e8c6b4a 100644 (file)
--- a/bsd/kern/kern_control.c
+++ b/bsd/kern/kern_control.c
@@ -165,6 +165,13 @@ ctl_connect(struct socket *so, struct sockaddr *nam, struct proc *p)
     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);
 
@@ -176,13 +183,6 @@ ctl_connect(struct socket *so, struct sockaddr *nam, struct proc *p)
     
     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) {
@@ -281,7 +281,8 @@ ctl_enqueuedata(void *ctlref, void *data, size_t len, u_int32_t flags)
     }
 
     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);