X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/89b3af67bb32e691275bf6fa803d1834b2284115..6601e61aa18bf4f09af135ff61fc7f4771d23b06:/bsd/kern/uipc_usrreq.c

diff --git a/bsd/kern/uipc_usrreq.c b/bsd/kern/uipc_usrreq.c
index 262197e47..ca560d415 100644
--- a/bsd/kern/uipc_usrreq.c
+++ b/bsd/kern/uipc_usrreq.c
@@ -1,29 +1,23 @@
 /*
  * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * @APPLE_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.
+ * 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.
  * 
- * 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,
- * 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_OSREFERENCE_LICENSE_HEADER_END@
+ * @APPLE_LICENSE_HEADER_END@
  */
 /*
  * Copyright (c) 1982, 1986, 1989, 1991, 1993
@@ -638,17 +632,13 @@ unp_bind(
 	char buf[SOCK_MAXADDRLEN];
 
 	context.vc_proc = p;
-	context.vc_ucred = kauth_cred_proc_ref(p);	/* XXX kauth_cred_get() ??? proxy */
+	context.vc_ucred = p->p_ucred;	/* XXX kauth_cred_get() ??? proxy */
 
-	if (unp->unp_vnode != NULL) {
-		kauth_cred_unref(&context.vc_ucred);
+	if (unp->unp_vnode != NULL)
 		return (EINVAL);
-	}
 	namelen = soun->sun_len - offsetof(struct sockaddr_un, sun_path);
-	if (namelen <= 0) {
-		kauth_cred_unref(&context.vc_ucred);
+	if (namelen <= 0)
 		return EINVAL;
-	}
 	strncpy(buf, soun->sun_path, namelen);
 	buf[namelen] = 0;	/* null-terminate the string */
 	NDINIT(&nd, CREATE, FOLLOW | LOCKPARENT, UIO_SYSSPACE32,
@@ -656,7 +646,6 @@ unp_bind(
 /* SHOULD BE ABLE TO ADOPT EXISTING AND wakeup() ALA FIFO's */
 	error = namei(&nd);
 	if (error) {
-		kauth_cred_unref(&context.vc_ucred);
 		return (error);
 	}
 	dvp = nd.ni_dvp;
@@ -672,7 +661,6 @@ unp_bind(
 		vnode_put(dvp);
 		vnode_put(vp);
 
-		kauth_cred_unref(&context.vc_ucred);
 		return (EADDRINUSE);
 	}
 
@@ -692,7 +680,6 @@ unp_bind(
 	vnode_put(dvp);
 
 	if (error) {
-		kauth_cred_unref(&context.vc_ucred);
 		return (error);
 	}
 	vnode_ref(vp);	/* gain a longterm reference */
@@ -701,7 +688,6 @@ unp_bind(
 	unp->unp_addr = (struct sockaddr_un *)dup_sockaddr(nam, 1);
 	vnode_put(vp);		/* drop the iocount */
 
-	kauth_cred_unref(&context.vc_ucred);
 	return (0);
 }
 
@@ -721,21 +707,18 @@ unp_connect(
 	char buf[SOCK_MAXADDRLEN];
 
 	context.vc_proc = p;
-	context.vc_ucred = kauth_cred_proc_ref(p);	/* XXX kauth_cred_get() ??? proxy */
+	context.vc_ucred = p->p_ucred;	/* XXX kauth_cred_get() ??? proxy */
 	so2 = so3 = NULL;
 
 	len = nam->sa_len - offsetof(struct sockaddr_un, sun_path);
-	if (len <= 0) {
-		kauth_cred_unref(&context.vc_ucred);
+	if (len <= 0)
 		return EINVAL;
-	}
 	strncpy(buf, soun->sun_path, len);
 	buf[len] = 0;
 
 	NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF, UIO_SYSSPACE32, CAST_USER_ADDR_T(buf), &context);
 	error = namei(&nd);
 	if (error) {
-		kauth_cred_unref(&context.vc_ucred);
 		return (error);
 	}
 	nameidone(&nd);
@@ -793,7 +776,7 @@ unp_connect(
 		 * from its process structure at the time of connect()
 		 * (which is now).
 		 */
-		cru2x(context.vc_ucred, &unp3->unp_peercred);
+		cru2x(p->p_ucred, &unp3->unp_peercred);
 		unp3->unp_flags |= UNP_HAVEPC;
 		/*
 		 * The receiver's (server's) credentials are copied
@@ -819,7 +802,6 @@ bad:
 			so2->so_usecount--;	/* release count on socket */
 	
 	vnode_put(vp);
-	kauth_cred_unref(&context.vc_ucred);
 	return (error);
 }
 
@@ -1090,9 +1072,8 @@ unp_externalize(struct mbuf *rights)
 		bzero(fp, sizeof(struct fileproc));
 		fp->f_iocount = 0;
 		fp->f_fglob = fg;
-		p->p_fd->fd_ofiles[f] = fp;
 		fg_removeuipc(fg);
-		*fdflags(p, f) &= ~UF_RESERVED;
+		procfdtbl_releasefd(p, f, fp);
 		unp_rights--;
 		*(int *)rp++ = f;
 	}
@@ -1170,7 +1151,16 @@ unp_internalize(
 	return (0);
 }
 
-static int	unp_defer, unp_gcing;
+static int	unp_defer, unp_gcing, unp_gcwait;
+/* always called under uipc_lock */
+void
+unp_gc_wait(void)
+{
+	while (unp_gcing != 0) {
+		unp_gcwait = 1;
+		msleep(&unp_gcing, uipc_lock, 0 , "unp_gc_wait", NULL);
+	}
+}
 
 static void
 unp_gc()
@@ -1179,7 +1169,8 @@ unp_gc()
 	register struct socket *so;
 	struct fileglob **extra_ref, **fpp;
 	int nunref, i;
-
+	int need_gcwakeup = 0;
+	
 	lck_mtx_lock(uipc_lock);
 	if (unp_gcing) {
 		lck_mtx_unlock(uipc_lock);
@@ -1361,7 +1352,17 @@ unp_gc()
 	}
 	for (i = nunref, fpp = extra_ref; --i >= 0; ++fpp)
 		closef_locked((struct fileproc *)0, *fpp, (struct proc *) NULL);
+	lck_mtx_lock(uipc_lock);
 	unp_gcing = 0;
+
+	if (unp_gcwait != 0) {
+		unp_gcwait = 0;
+		need_gcwakeup = 1;
+	}
+	lck_mtx_unlock(uipc_lock);
+
+	if (need_gcwakeup != 0)
+		wakeup(&unp_gcing);
 	FREE((caddr_t)extra_ref, M_FILEGLOB);
 
 }
@@ -1380,9 +1381,8 @@ unp_listen(
 	struct unpcb *unp,
 	struct proc *p)
 {
-	kauth_cred_t safecred = kauth_cred_proc_ref(p);
-	cru2x(safecred, &unp->unp_peercred);
-	kauth_cred_unref(&safecred);
+
+	cru2x(p->p_ucred, &unp->unp_peercred);
 	unp->unp_flags |= UNP_HAVEPCCACHED;
 	return (0);
 }