Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/kern/uipc_socket.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/kern/uipc_socket.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.114
retrieving revision 1.116.4.3
diff -u -p -r1.114 -r1.116.4.3
--- src/sys/kern/uipc_socket.c	2005/12/11 12:24:30	1.114
+++ src/sys/kern/uipc_socket.c	2006/05/06 23:31:31	1.116.4.3
@@ -1,4 +1,4 @@
-/*	$NetBSD: uipc_socket.c,v 1.114 2005/12/11 12:24:30 christos Exp $	*/
+/*	$NetBSD: uipc_socket.c,v 1.116.4.3 2006/05/06 23:31:31 christos Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.114 2005/12/11 12:24:30 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.116.4.3 2006/05/06 23:31:31 christos Exp $");
 
 #include "opt_sock_counters.h"
 #include "opt_sosend_loan.h"
@@ -91,6 +91,7 @@ __KERNEL_RCSID(0, "$NetBSD: uipc_socket.
 #include <sys/pool.h>
 #include <sys/event.h>
 #include <sys/poll.h>
+#include <sys/kauth.h>
 
 #include <uvm/uvm.h>
 
@@ -155,8 +156,8 @@ static int sokvawaiters;
 #define	SOCK_LOAN_THRESH	4096
 #define	SOCK_LOAN_CHUNK		65536
 
-static size_t sodopendfree(struct socket *);
-static size_t sodopendfreel(struct socket *);
+static size_t sodopendfree(void);
+static size_t sodopendfreel(void);
 
 static vsize_t
 sokvareserve(struct socket *so, vsize_t len)
@@ -173,7 +174,7 @@ sokvareserve(struct socket *so, vsize_t 
 		 * try to do pendfree.
 		 */
 
-		freed = sodopendfreel(so);
+		freed = sodopendfreel();
 
 		/*
 		 * if some kva was freed, try again.
@@ -292,14 +293,14 @@ sodoloanfree(struct vm_page **pgs, caddr
 }
 
 static size_t
-sodopendfree(struct socket *so)
+sodopendfree()
 {
 	int s;
 	size_t rv;
 
 	s = splvm();
 	simple_lock(&so_pendfree_slock);
-	rv = sodopendfreel(so);
+	rv = sodopendfreel();
 	simple_unlock(&so_pendfree_slock);
 	splx(s);
 
@@ -315,7 +316,7 @@ sodopendfree(struct socket *so)
  */
 
 static size_t
-sodopendfreel(struct socket *so)
+sodopendfreel()
 {
 	size_t rv = 0;
 
@@ -390,7 +391,7 @@ sosend_loan(struct socket *so, struct ui
 	vaddr_t lva, va;
 	int npgs, i, error;
 
-	if (uio->uio_segflg != UIO_USERSPACE)
+	if (VMSPACE_IS_KERNEL_P(uio->uio_vmspace))
 		return (0);
 
 	if (iov->iov_len < (size_t) space)
@@ -405,13 +406,12 @@ sosend_loan(struct socket *so, struct ui
 
 	/* XXX KDASSERT */
 	KASSERT(npgs <= M_EXT_MAXPAGES);
-	KASSERT(uio->uio_lwp != NULL);
 
 	lva = sokvaalloc(len, so);
 	if (lva == 0)
 		return 0;
 
-	error = uvm_loan(&uio->uio_lwp->l_proc->p_vmspace->vm_map, sva, len,
+	error = uvm_loan(&uio->uio_vmspace->vm_map, sva, len,
 	    m->m_ext.ext_pgs, UVM_LOAN_TOPAGE);
 	if (error) {
 		sokvafree(lva, len);
@@ -453,10 +453,9 @@ socreate(int dom, struct socket **aso, i
 {
 	const struct protosw	*prp;
 	struct socket	*so;
-	struct proc	*p;
+	uid_t		uid;
 	int		error, s;
 
-	p = l->l_proc;
 	if (proto)
 		prp = pffindproto(dom, proto, type);
 	else
@@ -479,10 +478,12 @@ socreate(int dom, struct socket **aso, i
 	so->so_snd.sb_mowner = &prp->pr_domain->dom_mowner;
 	so->so_mowner = &prp->pr_domain->dom_mowner;
 #endif
-	if (p != 0)
-		so->so_uidinfo = uid_find(p->p_ucred->cr_uid);
-	else
-		so->so_uidinfo = uid_find(0);
+	if (l != NULL) {
+		uid = kauth_cred_geteuid(l->l_proc->p_cred);
+	} else {
+		uid = 0;
+	}
+	so->so_uidinfo = uid_find(uid);
 	error = (*prp->pr_usrreq)(so, PRU_ATTACH, (struct mbuf *)0,
 	    (struct mbuf *)(long)proto, (struct mbuf *)0, l);
 	if (error) {
@@ -705,7 +706,7 @@ sodisconnect(struct socket *so)
 	    (struct lwp *)0);
  bad:
 	splx(s);
-	sodopendfree(so);
+	sodopendfree();
 	return (error);
 }
 
@@ -737,7 +738,7 @@ sosend(struct socket *so, struct mbuf *a
 	int		error, s, dontroute, atomic;
 
 	p = l->l_proc;
-	sodopendfree(so);
+	sodopendfree();
 
 	clen = 0;
 	atomic = sosendallatonce(so) || top;
@@ -933,7 +934,7 @@ int
 soreceive(struct socket *so, struct mbuf **paddr, struct uio *uio,
 	struct mbuf **mp0, struct mbuf **controlp, int *flagsp)
 {
-	struct lwp *l;
+	struct lwp *l = curlwp;
 	struct mbuf	*m, **mp;
 	int		flags, len, error, s, offset, moff, type, orig_resid;
 	const struct protosw	*pr;
@@ -944,7 +945,6 @@ soreceive(struct socket *so, struct mbuf
 	mp = mp0;
 	type = 0;
 	orig_resid = uio->uio_resid;
-	l = uio->uio_lwp;
 
 	if (paddr)
 		*paddr = 0;
@@ -956,7 +956,7 @@ soreceive(struct socket *so, struct mbuf
 		flags = 0;
 
 	if ((flags & MSG_DONTWAIT) == 0)
-		sodopendfree(so);
+		sodopendfree();
 
 	if (flags & MSG_OOB) {
 		m = m_get(M_WAIT, MT_DATA);