 @@ -1,1471 +1,1476 @@
-/*	$NetBSD: uipc_socket.c,v 1.191 2009/10/02 23:50:16 elad Exp $	*/
+/*	$NetBSD: uipc_socket.c,v 1.192 2009/10/03 01:41:39 elad Exp $	*/
 /*-
  * Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of Wasabi Systems, Inc, and by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Copyright (c) 2004 The FreeBSD Foundation
  * Copyright (c) 2004 Robert Watson
  * Copyright (c) 1982, 1986, 1988, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)uipc_socket.c	8.6 (Berkeley) 5/2/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.191 2009/10/02 23:50:16 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.192 2009/10/03 01:41:39 elad Exp $");
 #include "opt_compat_netbsd.h"
 #include "opt_sock_counters.h"
 #include "opt_sosend_loan.h"
 #include "opt_mbuftrace.h"
 #include "opt_somaxkva.h"
 #include "opt_multiprocessor.h"	/* XXX */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/kmem.h>
 #include <sys/mbuf.h>
 #include <sys/domain.h>
 #include <sys/kernel.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/signalvar.h>
 #include <sys/resourcevar.h>
 #include <sys/uidinfo.h>
 #include <sys/event.h>
 #include <sys/poll.h>
 #include <sys/kauth.h>
 #include <sys/mutex.h>
 #include <sys/condvar.h>
 #ifdef COMPAT_50
 #include <compat/sys/time.h>
 #include <compat/sys/socket.h>
 #endif
 #include <uvm/uvm.h>
 MALLOC_DEFINE(M_SOOPTS, "soopts", "socket options");
 MALLOC_DEFINE(M_SONAME, "soname", "socket name");
 extern const struct fileops socketops;
 extern int	somaxconn;			/* patchable (XXX sysctl) */
 int		somaxconn = SOMAXCONN;
 kmutex_t	*softnet_lock;
 #ifdef SOSEND_COUNTERS
 #include <sys/device.h>
 static struct evcnt sosend_loan_big = EVCNT_INITIALIZER(EVCNT_TYPE_MISC,
     NULL, "sosend", "loan big");
 static struct evcnt sosend_copy_big = EVCNT_INITIALIZER(EVCNT_TYPE_MISC,
     NULL, "sosend", "copy big");
 static struct evcnt sosend_copy_small = EVCNT_INITIALIZER(EVCNT_TYPE_MISC,
     NULL, "sosend", "copy small");
 static struct evcnt sosend_kvalimit = EVCNT_INITIALIZER(EVCNT_TYPE_MISC,
     NULL, "sosend", "kva limit");
 #define	SOSEND_COUNTER_INCR(ev)		(ev)->ev_count++
 EVCNT_ATTACH_STATIC(sosend_loan_big);
 EVCNT_ATTACH_STATIC(sosend_copy_big);
 EVCNT_ATTACH_STATIC(sosend_copy_small);
 EVCNT_ATTACH_STATIC(sosend_kvalimit);
 #else
 #define	SOSEND_COUNTER_INCR(ev)		/* nothing */
 #endif /* SOSEND_COUNTERS */
 static struct callback_entry sokva_reclaimerentry;
 #if defined(SOSEND_NO_LOAN) || defined(MULTIPROCESSOR)
 int sock_loan_thresh = -1;
 #else
 int sock_loan_thresh = 4096;
 #endif
 static kmutex_t so_pendfree_lock;
 static struct mbuf *so_pendfree;
 #ifndef SOMAXKVA
 #define	SOMAXKVA (16 * 1024 * 1024)
 #endif
 int somaxkva = SOMAXKVA;
 static int socurkva;
 static kcondvar_t socurkva_cv;
 static kauth_listener_t socket_listener;
 #define	SOCK_LOAN_CHUNK		65536
 static size_t sodopendfree(void);
 static size_t sodopendfreel(void);
 static void sysctl_kern_somaxkva_setup(void);
 static struct sysctllog *socket_sysctllog;
 static vsize_t
 sokvareserve(struct socket *so, vsize_t len)
+{
 	int error;
 	mutex_enter(&so_pendfree_lock);
 	while (socurkva + len > somaxkva) {
 		size_t freed;
 		/*
 		 * try to do pendfree.
 		 */
 		freed = sodopendfreel();
 		/*
 		 * if some kva was freed, try again.
 		 */
 		if (freed)
 			continue;
 		SOSEND_COUNTER_INCR(&sosend_kvalimit);
 		error = cv_wait_sig(&socurkva_cv, &so_pendfree_lock);
 		if (error) {
 			len = 0;
 			break;
+		}
+	}
 	socurkva += len;
 	mutex_exit(&so_pendfree_lock);
 	return len;
+}
 static void
 sokvaunreserve(vsize_t len)
+{
 	mutex_enter(&so_pendfree_lock);
 	socurkva -= len;
 	cv_broadcast(&socurkva_cv);
 	mutex_exit(&so_pendfree_lock);
+}
 /*
  * sokvaalloc: allocate kva for loan.
  */
 vaddr_t
 sokvaalloc(vsize_t len, struct socket *so)
+{
 	vaddr_t lva;
 	/*
 	 * reserve kva.
 	 */
 	if (sokvareserve(so, len) == 0)
 		return 0;
 	/*
 	 * allocate kva.
 	 */
 	lva = uvm_km_alloc(kernel_map, len, 0, UVM_KMF_VAONLY | UVM_KMF_WAITVA);
 	if (lva == 0) {
 		sokvaunreserve(len);
 		return (0);
+	}
 	return lva;
+}
 /*
  * sokvafree: free kva for loan.
  */
 void
 sokvafree(vaddr_t sva, vsize_t len)
+{
 	/*
 	 * free kva.
 	 */
 	uvm_km_free(kernel_map, sva, len, UVM_KMF_VAONLY);
 	/*
 	 * unreserve kva.
 	 */
 	sokvaunreserve(len);
+}
 static void
 sodoloanfree(struct vm_page **pgs, void *buf, size_t size)
+{
 	vaddr_t sva, eva;
 	vsize_t len;
 	int npgs;
 	KASSERT(pgs != NULL);
 	eva = round_page((vaddr_t) buf + size);
 	sva = trunc_page((vaddr_t) buf);
 	len = eva - sva;
 	npgs = len >> PAGE_SHIFT;
 	pmap_kremove(sva, len);
 	pmap_update(pmap_kernel());
 	uvm_unloan(pgs, npgs, UVM_LOAN_TOPAGE);
 	sokvafree(sva, len);
+}
 static size_t
 sodopendfree(void)
+{
 	size_t rv;
 	if (__predict_true(so_pendfree == NULL))
 		return 0;
 	mutex_enter(&so_pendfree_lock);
 	rv = sodopendfreel();
 	mutex_exit(&so_pendfree_lock);
 	return rv;
+}
 /*
  * sodopendfreel: free mbufs on "pendfree" list.
  * unlock and relock so_pendfree_lock when freeing mbufs.
+ *
  * => called with so_pendfree_lock held.
  */
 static size_t
 sodopendfreel(void)
+{
 	struct mbuf *m, *next;
 	size_t rv = 0;
 	KASSERT(mutex_owned(&so_pendfree_lock));
 	while (so_pendfree != NULL) {
 		m = so_pendfree;
 		so_pendfree = NULL;
 		mutex_exit(&so_pendfree_lock);
 		for (; m != NULL; m = next) {
 			next = m->m_next;
 			KASSERT((~m->m_flags & (M_EXT|M_EXT_PAGES)) == 0);
 			KASSERT(m->m_ext.ext_refcnt == 0);
 			rv += m->m_ext.ext_size;
 			sodoloanfree(m->m_ext.ext_pgs, m->m_ext.ext_buf,
 			    m->m_ext.ext_size);
 			pool_cache_put(mb_cache, m);
+		}
 		mutex_enter(&so_pendfree_lock);
+	}
 	return (rv);
+}
 void
 soloanfree(struct mbuf *m, void *buf, size_t size, void *arg)
+{
 	KASSERT(m != NULL);
 	/*
 	 * postpone freeing mbuf.
+	 *
 	 * we can't do it in interrupt context
 	 * because we need to put kva back to kernel_map.
 	 */
 	mutex_enter(&so_pendfree_lock);
 	m->m_next = so_pendfree;
 	so_pendfree = m;
 	cv_broadcast(&socurkva_cv);
 	mutex_exit(&so_pendfree_lock);
+}
 static long
 sosend_loan(struct socket *so, struct uio *uio, struct mbuf *m, long space)
+{
 	struct iovec *iov = uio->uio_iov;
 	vaddr_t sva, eva;
 	vsize_t len;
 	vaddr_t lva;
 	int npgs, error;
 	vaddr_t va;
 	int i;
 	if (VMSPACE_IS_KERNEL_P(uio->uio_vmspace))
 		return (0);
 	if (iov->iov_len < (size_t) space)
 		space = iov->iov_len;
 	if (space > SOCK_LOAN_CHUNK)
 		space = SOCK_LOAN_CHUNK;
 	eva = round_page((vaddr_t) iov->iov_base + space);
 	sva = trunc_page((vaddr_t) iov->iov_base);
 	len = eva - sva;
 	npgs = len >> PAGE_SHIFT;
 	KASSERT(npgs <= M_EXT_MAXPAGES);
 	lva = sokvaalloc(len, so);
 	if (lva == 0)
 		return 0;
 	error = uvm_loan(&uio->uio_vmspace->vm_map, sva, len,
 	    m->m_ext.ext_pgs, UVM_LOAN_TOPAGE);
 	if (error) {
 		sokvafree(lva, len);
 		return (0);
+	}
 	for (i = 0, va = lva; i < npgs; i++, va += PAGE_SIZE)
 		pmap_kenter_pa(va, VM_PAGE_TO_PHYS(m->m_ext.ext_pgs[i]),
 		    VM_PROT_READ);
 	pmap_update(pmap_kernel());
 	lva += (vaddr_t) iov->iov_base & PAGE_MASK;
 	MEXTADD(m, (void *) lva, space, M_MBUF, soloanfree, so);
 	m->m_flags |= M_EXT_PAGES | M_EXT_ROMAP;
 	uio->uio_resid -= space;
 	/* uio_offset not updated, not set/used for write(2) */
 	uio->uio_iov->iov_base = (char *)uio->uio_iov->iov_base + space;
 	uio->uio_iov->iov_len -= space;
 	if (uio->uio_iov->iov_len == 0) {
 		uio->uio_iov++;
 		uio->uio_iovcnt--;
+	}
 	return (space);
+}
 static int
 sokva_reclaim_callback(struct callback_entry *ce, void *obj, void *arg)
+{
 	KASSERT(ce == &sokva_reclaimerentry);
 	KASSERT(obj == NULL);
 	sodopendfree();
 	if (!vm_map_starved_p(kernel_map)) {
 		return CALLBACK_CHAIN_ABORT;
+	}
 	return CALLBACK_CHAIN_CONTINUE;
+}
 struct mbuf *
 getsombuf(struct socket *so, int type)
+{
 	struct mbuf *m;
 	m = m_get(M_WAIT, type);
 	MCLAIM(m, so->so_mowner);
 	return m;
+}
 static int
 socket_listener_cb(kauth_cred_t cred, kauth_action_t action, void *cookie,
     void *arg0, void *arg1, void *arg2, void *arg3)
+{
 	int result;
 	enum kauth_network_req req;
 	result = KAUTH_RESULT_DEFER;
 	req = (enum kauth_network_req)arg0;
 	if (action != KAUTH_NETWORK_SOCKET)
 		return result;
 	switch (req) {
 	case KAUTH_REQ_NETWORK_SOCKET_DROP: {
 		/* Normal users can only drop their own connections. */
 		struct socket *so = (struct socket *)arg1;
 		uid_t sockuid = so->so_uidinfo->ui_uid;
 		if (sockuid == kauth_cred_getuid(cred) ||
 		    sockuid == kauth_cred_geteuid(cred))
 			result = KAUTH_RESULT_ALLOW;
 		break;
+		}
 	case KAUTH_REQ_NETWORK_SOCKET_OPEN:
 		/* We allow "raw" routing/bluetooth sockets to anyone. */
 		if ((u_long)arg1 == PF_ROUTE || (u_long)arg1 == PF_BLUETOOTH)
 			result = KAUTH_RESULT_ALLOW;
 		else {
 			/* Privileged, let secmodel handle this. */
 			if ((u_long)arg2 == SOCK_RAW)
 				break;
+		}
 		result = KAUTH_RESULT_ALLOW;
 		break;
 	case KAUTH_REQ_NETWORK_SOCKET_CANSEE:
 		result = KAUTH_RESULT_ALLOW;
 		break;
 	default:
 		break;
+	}
 	return result;
+}
 void
 soinit(void)
+{
 	sysctl_kern_somaxkva_setup();
 	mutex_init(&so_pendfree_lock, MUTEX_DEFAULT, IPL_VM);
 	softnet_lock = mutex_obj_alloc(MUTEX_DEFAULT, IPL_NONE);
 	cv_init(&socurkva_cv, "sokva");
 	soinit2();
 	/* Set the initial adjusted socket buffer size. */
 	if (sb_max_set(sb_max))
 		panic("bad initial sb_max value: %lu", sb_max);
 	callback_register(&vm_map_to_kernel(kernel_map)->vmk_reclaim_callback,
 	    &sokva_reclaimerentry, NULL, sokva_reclaim_callback);
 	socket_listener = kauth_listen_scope(KAUTH_SCOPE_NETWORK,
 	    socket_listener_cb, NULL);
+}
 /*
  * Socket operation routines.
  * These routines are called by the routines in
  * sys_socket.c or from a system process, and
  * implement the semantics of socket operations by
  * switching out to the protocol specific routines.
  */
 /*ARGSUSED*/
 int
 socreate(int dom, struct socket **aso, int type, int proto, struct lwp *l,
 	 struct socket *lockso)
+{
 	const struct protosw	*prp;
 	struct socket	*so;
 	uid_t		uid;
 	int		error;
 	kmutex_t	*lock;
 	error = kauth_authorize_network(l->l_cred, KAUTH_NETWORK_SOCKET,
 	    KAUTH_REQ_NETWORK_SOCKET_OPEN, KAUTH_ARG(dom), KAUTH_ARG(type),
 	    KAUTH_ARG(proto));
 	if (error != 0)
 		return error;
 	if (proto)
 		prp = pffindproto(dom, proto, type);
 	else
 		prp = pffindtype(dom, type);
 	if (prp == NULL) {
 		/* no support for domain */
 		if (pffinddomain(dom) == 0)
 			return EAFNOSUPPORT;
 		/* no support for socket type */
 		if (proto == 0 && type != 0)
 			return EPROTOTYPE;
 		return EPROTONOSUPPORT;
+	}
 	if (prp->pr_usrreq == NULL)
 		return EPROTONOSUPPORT;
 	if (prp->pr_type != type)
 		return EPROTOTYPE;
 	so = soget(true);
 	so->so_type = type;
 	so->so_proto = prp;
 	so->so_send = sosend;
 	so->so_receive = soreceive;
 #ifdef MBUFTRACE
 	so->so_rcv.sb_mowner = &prp->pr_domain->dom_mowner;
 	so->so_snd.sb_mowner = &prp->pr_domain->dom_mowner;
 	so->so_mowner = &prp->pr_domain->dom_mowner;
 #endif
 	/* so->so_cred = kauth_cred_dup(l->l_cred); */
 	uid = kauth_cred_geteuid(l->l_cred);
 	so->so_uidinfo = uid_find(uid);
 	so->so_egid = kauth_cred_getegid(l->l_cred);
 	so->so_cpid = l->l_proc->p_pid;
 	if (lockso != NULL) {
 		/* Caller wants us to share a lock. */
 		lock = lockso->so_lock;
 		so->so_lock = lock;
 		mutex_obj_hold(lock);
 		mutex_enter(lock);
 	} else {
 		/* Lock assigned and taken during PRU_ATTACH. */
+	}
 	error = (*prp->pr_usrreq)(so, PRU_ATTACH, NULL,
 	    (struct mbuf *)(long)proto, NULL, l);
 	KASSERT(solocked(so));
 	if (error != 0) {
 		so->so_state |= SS_NOFDREF;
 		sofree(so);
 		return error;
+	}
 	sounlock(so);
 	*aso = so;
 	return 0;
+}
 /* On success, write file descriptor to fdout and return zero.  On
  * failure, return non-zero; *fdout will be undefined.
  */
 int
 fsocreate(int domain, struct socket **sop, int type, int protocol,
     struct lwp *l, int *fdout)
+{
 	struct socket	*so;
 	struct file	*fp;
 	int		fd, error;
 	if ((error = fd_allocfile(&fp, &fd)) != 0)
 		return (error);
 	fp->f_flag = FREAD|FWRITE;
 	fp->f_type = DTYPE_SOCKET;
 	fp->f_ops = &socketops;
 	error = socreate(domain, &so, type, protocol, l, NULL);
 	if (error != 0) {
 		fd_abort(curproc, fp, fd);
 	} else {
 		if (sop != NULL)
 			*sop = so;
 		fp->f_data = so;
 		fd_affix(curproc, fp, fd);
 		*fdout = fd;
+	}
 	return error;
+}
 int
 sofamily(const struct socket *so)
+{
 	const struct protosw *pr;
 	const struct domain *dom;
 	if ((pr = so->so_proto) == NULL)
 		return AF_UNSPEC;
 	if ((dom = pr->pr_domain) == NULL)
 		return AF_UNSPEC;
 	return dom->dom_family;
+}
 int
 sobind(struct socket *so, struct mbuf *nam, struct lwp *l)
+{
 	int	error;
 	solock(so);
 	error = (*so->so_proto->pr_usrreq)(so, PRU_BIND, NULL, nam, NULL, l);
 	sounlock(so);
 	return error;
+}
 int
 solisten(struct socket *so, int backlog, struct lwp *l)
+{
 	int	error;
 	solock(so);
 	if ((so->so_state & (SS_ISCONNECTED | SS_ISCONNECTING |
 	    SS_ISDISCONNECTING)) != 0) {
 	    	sounlock(so);
 		return (EOPNOTSUPP);
+	}
 	error = (*so->so_proto->pr_usrreq)(so, PRU_LISTEN, NULL,
 	    NULL, NULL, l);
 	if (error != 0) {
 		sounlock(so);
 		return error;
+	}
 	if (TAILQ_EMPTY(&so->so_q))
 		so->so_options |= SO_ACCEPTCONN;
 	if (backlog < 0)
 		backlog = 0;
 	so->so_qlimit = min(backlog, somaxconn);
 	sounlock(so);
 	return 0;
+}
 void
 sofree(struct socket *so)
+{
 	u_int refs;
 	KASSERT(solocked(so));
 	if (so->so_pcb || (so->so_state & SS_NOFDREF) == 0) {
 		sounlock(so);
 		return;
+	}
 	if (so->so_head) {
 		/*
 		 * We must not decommission a socket that's on the accept(2)
 		 * queue.  If we do, then accept(2) may hang after select(2)
 		 * indicated that the listening socket was ready.
 		 */
 		if (!soqremque(so, 0)) {
 			sounlock(so);
 			return;
+		}
+	}
 	if (so->so_rcv.sb_hiwat)
 		(void)chgsbsize(so->so_uidinfo, &so->so_rcv.sb_hiwat, 0,
 		    RLIM_INFINITY);
 	if (so->so_snd.sb_hiwat)
 		(void)chgsbsize(so->so_uidinfo, &so->so_snd.sb_hiwat, 0,
 		    RLIM_INFINITY);
 	sbrelease(&so->so_snd, so);
 	KASSERT(!cv_has_waiters(&so->so_cv));
 	KASSERT(!cv_has_waiters(&so->so_rcv.sb_cv));
 	KASSERT(!cv_has_waiters(&so->so_snd.sb_cv));
 	sorflush(so);
 	refs = so->so_aborting;	/* XXX */
 	/* Remove acccept filter if one is present. */
 	if (so->so_accf != NULL)
 		(void)accept_filt_clear(so);
 	/* kauth_cred_free(so->so_cred); */
 	sounlock(so);
 	if (refs == 0)		/* XXX */
 		soput(so);
+}
 /*
  * Close a socket on last file table reference removal.
  * Initiate disconnect if connected.
  * Free socket when disconnect complete.
  */
 int
 soclose(struct socket *so)
+{
 	struct socket	*so2;
 	int		error;
 	int		error2;
 	error = 0;
 	solock(so);
 	if (so->so_options & SO_ACCEPTCONN) {
 		for (;;) {
 			if ((so2 = TAILQ_FIRST(&so->so_q0)) != 0) {
 				KASSERT(solocked2(so, so2));
 				(void) soqremque(so2, 0);
 				/* soabort drops the lock. */
 				(void) soabort(so2);
 				solock(so);
 				continue;
+			}
 			if ((so2 = TAILQ_FIRST(&so->so_q)) != 0) {
 				KASSERT(solocked2(so, so2));
 				(void) soqremque(so2, 1);
 				/* soabort drops the lock. */
 				(void) soabort(so2);
 				solock(so);
 				continue;
+			}
 			break;
+		}
+	}
 	if (so->so_pcb == 0)
 		goto discard;
 	if (so->so_state & SS_ISCONNECTED) {
 		if ((so->so_state & SS_ISDISCONNECTING) == 0) {
 			error = sodisconnect(so);
 			if (error)
 				goto drop;
+		}
 		if (so->so_options & SO_LINGER) {
 			if ((so->so_state & SS_ISDISCONNECTING) && so->so_nbio)
 				goto drop;
 			while (so->so_state & SS_ISCONNECTED) {
 				error = sowait(so, true, so->so_linger * hz);
 				if (error)
 					break;
+			}
+		}
+	}
  drop:
 	if (so->so_pcb) {
 		error2 = (*so->so_proto->pr_usrreq)(so, PRU_DETACH,
 		    NULL, NULL, NULL, NULL);
 		if (error == 0)
 			error = error2;
+	}
  discard:
 	if (so->so_state & SS_NOFDREF)
 		panic("soclose: NOFDREF");
 	so->so_state |= SS_NOFDREF;
 	sofree(so);
 	return (error);
+}
 /*
  * Must be called with the socket locked..  Will return with it unlocked.
  */
 int
 soabort(struct socket *so)
+{
 	u_int refs;
 	int error;
 	KASSERT(solocked(so));
 	KASSERT(so->so_head == NULL);
 	so->so_aborting++;		/* XXX */
 	error = (*so->so_proto->pr_usrreq)(so, PRU_ABORT, NULL,
 	    NULL, NULL, NULL);
 	refs = --so->so_aborting;	/* XXX */
 	if (error || (refs == 0)) {
 		sofree(so);
 	} else {
 		sounlock(so);
+	}
 	return error;
+}
 int
 soaccept(struct socket *so, struct mbuf *nam)
+{
 	int	error;
 	KASSERT(solocked(so));
 	error = 0;
 	if ((so->so_state & SS_NOFDREF) == 0)
 		panic("soaccept: !NOFDREF");
 	so->so_state &= ~SS_NOFDREF;
 	if ((so->so_state & SS_ISDISCONNECTED) == 0 ||
 	    (so->so_proto->pr_flags & PR_ABRTACPTDIS) == 0)
 		error = (*so->so_proto->pr_usrreq)(so, PRU_ACCEPT,
 		    NULL, nam, NULL, NULL);
 	else
 		error = ECONNABORTED;
 	return (error);
+}
 int
 soconnect(struct socket *so, struct mbuf *nam, struct lwp *l)
+{
 	int		error;
 	KASSERT(solocked(so));
 	if (so->so_options & SO_ACCEPTCONN)
 		return (EOPNOTSUPP);
 	/*
 	 * If protocol is connection-based, can only connect once.
 	 * Otherwise, if connected, try to disconnect first.
 	 * This allows user to disconnect by connecting to, e.g.,
 	 * a null address.
 	 */
 	if (so->so_state & (SS_ISCONNECTED|SS_ISCONNECTING) &&
 	    ((so->so_proto->pr_flags & PR_CONNREQUIRED) ||
 	    (error = sodisconnect(so))))
 		error = EISCONN;
 	else
 		error = (*so->so_proto->pr_usrreq)(so, PRU_CONNECT,
 		    NULL, nam, NULL, l);
 	return (error);
+}
 int
 soconnect2(struct socket *so1, struct socket *so2)
+{
 	int	error;
 	KASSERT(solocked2(so1, so2));
 	error = (*so1->so_proto->pr_usrreq)(so1, PRU_CONNECT2,
 	    NULL, (struct mbuf *)so2, NULL, NULL);
 	return (error);
+}
 int
 sodisconnect(struct socket *so)
+{
 	int	error;
 	KASSERT(solocked(so));
 	if ((so->so_state & SS_ISCONNECTED) == 0) {
 		error = ENOTCONN;
 	} else if (so->so_state & SS_ISDISCONNECTING) {
 		error = EALREADY;
 	} else {
 		error = (*so->so_proto->pr_usrreq)(so, PRU_DISCONNECT,
 		    NULL, NULL, NULL, NULL);
+	}
 	sodopendfree();
 	return (error);
+}
 #define	SBLOCKWAIT(f)	(((f) & MSG_DONTWAIT) ? M_NOWAIT : M_WAITOK)
 /*
  * Send on a socket.
  * If send must go all at once and message is larger than
  * send buffering, then hard error.
  * Lock against other senders.
  * If must go all at once and not enough room now, then
  * inform user that this would block and do nothing.
  * Otherwise, if nonblocking, send as much as possible.
  * The data to be sent is described by "uio" if nonzero,
  * otherwise by the mbuf chain "top" (which must be null
  * if uio is not).  Data provided in mbuf chain must be small
  * enough to send all at once.
+ *
  * Returns nonzero on error, timeout or signal; callers
  * must check for short counts if EINTR/ERESTART are returned.
  * Data and control buffers are freed on return.
  */
 int
 sosend(struct socket *so, struct mbuf *addr, struct uio *uio, struct mbuf *top,
 	struct mbuf *control, int flags, struct lwp *l)
+{
 	struct mbuf	**mp, *m;
 	struct proc	*p;
 	long		space, len, resid, clen, mlen;
 	int		error, s, dontroute, atomic;
 	p = l->l_proc;
 	sodopendfree();
 	clen = 0;
 	/*
 	 * solock() provides atomicity of access.  splsoftnet() prevents
 	 * protocol processing soft interrupts from interrupting us and
 	 * blocking (expensive).
 	 */
 	s = splsoftnet();
 	solock(so);
 	atomic = sosendallatonce(so) || top;
 	if (uio)
 		resid = uio->uio_resid;
 	else
 		resid = top->m_pkthdr.len;
 	/*
 	 * In theory resid should be unsigned.
 	 * However, space must be signed, as it might be less than 0
 	 * if we over-committed, and we must use a signed comparison
 	 * of space and resid.  On the other hand, a negative resid
 	 * causes us to loop sending 0-length segments to the protocol.
 	 */
 	if (resid < 0) {
 		error = EINVAL;
 		goto out;
+	}
 	dontroute =
 	    (flags & MSG_DONTROUTE) && (so->so_options & SO_DONTROUTE) == 0 &&
 	    (so->so_proto->pr_flags & PR_ATOMIC);
 	l->l_ru.ru_msgsnd++;
 	if (control)
 		clen = control->m_len;
  restart:
 	if ((error = sblock(&so->so_snd, SBLOCKWAIT(flags))) != 0)
 		goto out;
 	do {
 		if (so->so_state & SS_CANTSENDMORE) {
 			error = EPIPE;
 			goto release;
+		}
 		if (so->so_error) {
 			error = so->so_error;
 			so->so_error = 0;
 			goto release;
+		}
 		if ((so->so_state & SS_ISCONNECTED) == 0) {
 			if (so->so_proto->pr_flags & PR_CONNREQUIRED) {
 				if ((so->so_state & SS_ISCONFIRMING) == 0 &&
 				    !(resid == 0 && clen != 0)) {
 					error = ENOTCONN;
 					goto release;
+				}
 			} else if (addr == 0) {
 				error = EDESTADDRREQ;
 				goto release;
+			}
+		}
 		space = sbspace(&so->so_snd);
 		if (flags & MSG_OOB)
 			space += 1024;
 		if ((atomic && resid > so->so_snd.sb_hiwat) ||
 		    clen > so->so_snd.sb_hiwat) {
 			error = EMSGSIZE;
 			goto release;
+		}
 		if (space < resid + clen &&
 		    (atomic || space < so->so_snd.sb_lowat || space < clen)) {
 			if (so->so_nbio) {
 				error = EWOULDBLOCK;
 				goto release;
+			}
 			sbunlock(&so->so_snd);
 			error = sbwait(&so->so_snd);
 			if (error)
 				goto out;
 			goto restart;
+		}
 		mp = &top;
 		space -= clen;
 		do {
 			if (uio == NULL) {
 				/*
 				 * Data is prepackaged in "top".
 				 */
 				resid = 0;
 				if (flags & MSG_EOR)
 					top->m_flags |= M_EOR;
 			} else do {
 				sounlock(so);
 				splx(s);
 				if (top == NULL) {
 					m = m_gethdr(M_WAIT, MT_DATA);
 					mlen = MHLEN;
 					m->m_pkthdr.len = 0;
 					m->m_pkthdr.rcvif = NULL;
 				} else {
 					m = m_get(M_WAIT, MT_DATA);
 					mlen = MLEN;
+				}
 				MCLAIM(m, so->so_snd.sb_mowner);
 				if (sock_loan_thresh >= 0 &&
 				    uio->uio_iov->iov_len >= sock_loan_thresh &&
 				    space >= sock_loan_thresh &&
 				    (len = sosend_loan(so, uio, m,
 						       space)) != 0) {
 					SOSEND_COUNTER_INCR(&sosend_loan_big);
 					space -= len;
 					goto have_data;
+				}
 				if (resid >= MINCLSIZE && space >= MCLBYTES) {
 					SOSEND_COUNTER_INCR(&sosend_copy_big);
 					m_clget(m, M_WAIT);
 					if ((m->m_flags & M_EXT) == 0)
 						goto nopages;
 					mlen = MCLBYTES;
 					if (atomic && top == 0) {
 						len = lmin(MCLBYTES - max_hdr,
 						    resid);
 						m->m_data += max_hdr;
 					} else
 						len = lmin(MCLBYTES, resid);
 					space -= len;
 				} else {
  nopages:
 					SOSEND_COUNTER_INCR(&sosend_copy_small);
 					len = lmin(lmin(mlen, resid), space);
 					space -= len;
 					/*
 					 * For datagram protocols, leave room
 					 * for protocol headers in first mbuf.
 					 */
 					if (atomic && top == 0 && len < mlen)
 						MH_ALIGN(m, len);
+				}
 				error = uiomove(mtod(m, void *), (int)len, uio);
  have_data:
 				resid = uio->uio_resid;
 				m->m_len = len;
 				*mp = m;
 				top->m_pkthdr.len += len;
 				s = splsoftnet();
 				solock(so);
 				if (error != 0)
 					goto release;
 				mp = &m->m_next;
 				if (resid <= 0) {
 					if (flags & MSG_EOR)
 						top->m_flags |= M_EOR;
 					break;
+				}
 			} while (space > 0 && atomic);
 			if (so->so_state & SS_CANTSENDMORE) {
 				error = EPIPE;
 				goto release;
+			}
 			if (dontroute)
 				so->so_options |= SO_DONTROUTE;
 			if (resid > 0)
 				so->so_state |= SS_MORETOCOME;
 			error = (*so->so_proto->pr_usrreq)(so,
 			    (flags & MSG_OOB) ? PRU_SENDOOB : PRU_SEND,
 			    top, addr, control, curlwp);
 			if (dontroute)
 				so->so_options &= ~SO_DONTROUTE;
 			if (resid > 0)
 				so->so_state &= ~SS_MORETOCOME;
 			clen = 0;
 			control = NULL;
 			top = NULL;
 			mp = &top;
 			if (error != 0)
 				goto release;
 		} while (resid && space > 0);
 	} while (resid);
  release:
 	sbunlock(&so->so_snd);
  out:
 	sounlock(so);
 	splx(s);
 	if (top)
 		m_freem(top);
 	if (control)
 		m_freem(control);
 	return (error);
+}
 /*
  * Following replacement or removal of the first mbuf on the first
  * mbuf chain of a socket buffer, push necessary state changes back
  * into the socket buffer so that other consumers see the values
  * consistently.  'nextrecord' is the callers locally stored value of
  * the original value of sb->sb_mb->m_nextpkt which must be restored
  * when the lead mbuf changes.  NOTE: 'nextrecord' may be NULL.
  */
 static void
 sbsync(struct sockbuf *sb, struct mbuf *nextrecord)
+{
 	KASSERT(solocked(sb->sb_so));
 	/*
 	 * First, update for the new value of nextrecord.  If necessary,
 	 * make it the first record.
 	 */
 	if (sb->sb_mb != NULL)
 		sb->sb_mb->m_nextpkt = nextrecord;
 	else
 		sb->sb_mb = nextrecord;
         /*
          * Now update any dependent socket buffer fields to reflect
          * the new state.  This is an inline of SB_EMPTY_FIXUP, with
          * the addition of a second clause that takes care of the
          * case where sb_mb has been updated, but remains the last
          * record.
          */
         if (sb->sb_mb == NULL) {
                 sb->sb_mbtail = NULL;
                 sb->sb_lastrecord = NULL;
         } else if (sb->sb_mb->m_nextpkt == NULL)
                 sb->sb_lastrecord = sb->sb_mb;
+}
 /*
  * Implement receive operations on a socket.
  * We depend on the way that records are added to the sockbuf
  * by sbappend*.  In particular, each record (mbufs linked through m_next)
  * must begin with an address if the protocol so specifies,
  * followed by an optional mbuf or mbufs containing ancillary data,
  * and then zero or more mbufs of data.
  * In order to avoid blocking network interrupts for the entire time here,
  * we splx() while doing the actual copy to user space.
  * Although the sockbuf is locked, new data may still be appended,
  * and thus we must maintain consistency of the sockbuf during that time.
+ *
  * The caller may receive the data as a single mbuf chain by supplying
  * an mbuf **mp0 for use in returning the chain.  The uio is then used
  * only for the count in uio_resid.
  */
 int
 soreceive(struct socket *so, struct mbuf **paddr, struct uio *uio,
 	struct mbuf **mp0, struct mbuf **controlp, int *flagsp)
+{
 	struct lwp *l = curlwp;
 	struct mbuf	*m, **mp, *mt;
 	int atomic, flags, len, error, s, offset, moff, type, orig_resid;
 	const struct protosw	*pr;
 	struct mbuf	*nextrecord;
 	int		mbuf_removed = 0;
 	const struct domain *dom;
 	pr = so->so_proto;
 	atomic = pr->pr_flags & PR_ATOMIC;
 	dom = pr->pr_domain;
 	mp = mp0;
 	type = 0;
 	orig_resid = uio->uio_resid;
 	if (paddr != NULL)
 		*paddr = NULL;
 	if (controlp != NULL)
 		*controlp = NULL;
 	if (flagsp != NULL)
 		flags = *flagsp &~ MSG_EOR;
 	else
 		flags = 0;
 	if ((flags & MSG_DONTWAIT) == 0)
 		sodopendfree();
 	if (flags & MSG_OOB) {
 		m = m_get(M_WAIT, MT_DATA);
 		solock(so);
 		error = (*pr->pr_usrreq)(so, PRU_RCVOOB, m,
 		    (struct mbuf *)(long)(flags & MSG_PEEK), NULL, l);
 		sounlock(so);
 		if (error)
 			goto bad;
 		do {
 			error = uiomove(mtod(m, void *),
 			    (int) min(uio->uio_resid, m->m_len), uio);
 			m = m_free(m);
 		} while (uio->uio_resid > 0 && error == 0 && m);
  bad:
 		if (m != NULL)
 			m_freem(m);
 		return error;
+	}
 	if (mp != NULL)
 		*mp = NULL;
 	/*
 	 * solock() provides atomicity of access.  splsoftnet() prevents
 	 * protocol processing soft interrupts from interrupting us and
 	 * blocking (expensive).
 	 */
 	s = splsoftnet();
 	solock(so);
 	if (so->so_state & SS_ISCONFIRMING && uio->uio_resid)
 		(*pr->pr_usrreq)(so, PRU_RCVD, NULL, NULL, NULL, l);
  restart:
 	if ((error = sblock(&so->so_rcv, SBLOCKWAIT(flags))) != 0) {
 		sounlock(so);
 		splx(s);
 		return error;
+	}
 	m = so->so_rcv.sb_mb;
 	/*
 	 * If we have less data than requested, block awaiting more
 	 * (subject to any timeout) if:
 	 *   1. the current count is less than the low water mark,
 	 *   2. MSG_WAITALL is set, and it is possible to do the entire
 	 *	receive operation at once if we block (resid <= hiwat), or
 	 *   3. MSG_DONTWAIT is not set.
 	 * If MSG_WAITALL is set but resid is larger than the receive buffer,
 	 * we have to do the receive in sections, and thus risk returning
 	 * a short count if a timeout or signal occurs after we start.
 	 */
 	if (m == NULL ||
 	    ((flags & MSG_DONTWAIT) == 0 &&
 	     so->so_rcv.sb_cc < uio->uio_resid &&
 	     (so->so_rcv.sb_cc < so->so_rcv.sb_lowat ||
 	      ((flags & MSG_WAITALL) &&
 	       uio->uio_resid <= so->so_rcv.sb_hiwat)) &&
 	     m->m_nextpkt == NULL && !atomic)) {
 #ifdef DIAGNOSTIC
 		if (m == NULL && so->so_rcv.sb_cc)
 			panic("receive 1");
 #endif
 		if (so->so_error) {
 			if (m != NULL)
 				goto dontblock;
 			error = so->so_error;
 			if ((flags & MSG_PEEK) == 0)
 				so->so_error = 0;
 			goto release;
+		}
 		if (so->so_state & SS_CANTRCVMORE) {
 			if (m != NULL)
 				goto dontblock;
 			else
 				goto release;
+		}
 		for (; m != NULL; m = m->m_next)
 			if (m->m_type == MT_OOBDATA  || (m->m_flags & M_EOR)) {
 				m = so->so_rcv.sb_mb;
 				goto dontblock;
+			}
 		if ((so->so_state & (SS_ISCONNECTED|SS_ISCONNECTING)) == 0 &&
 		    (so->so_proto->pr_flags & PR_CONNREQUIRED)) {
 			error = ENOTCONN;
 			goto release;
+		}
 		if (uio->uio_resid == 0)
 			goto release;
 		if (so->so_nbio || (flags & MSG_DONTWAIT)) {
 			error = EWOULDBLOCK;
 			goto release;
+		}
 		SBLASTRECORDCHK(&so->so_rcv, "soreceive sbwait 1");
 		SBLASTMBUFCHK(&so->so_rcv, "soreceive sbwait 1");
 		sbunlock(&so->so_rcv);
 		error = sbwait(&so->so_rcv);
 		if (error != 0) {
 			sounlock(so);
 			splx(s);
 			return error;
+		}
 		goto restart;
+	}
  dontblock:
 	/*
 	 * On entry here, m points to the first record of the socket buffer.
 	 * From this point onward, we maintain 'nextrecord' as a cache of the
 	 * pointer to the next record in the socket buffer.  We must keep the
 	 * various socket buffer pointers and local stack versions of the
 	 * pointers in sync, pushing out modifications before dropping the
 	 * socket lock, and re-reading them when picking it up.
+	 *
 	 * Otherwise, we will race with the network stack appending new data
 	 * or records onto the socket buffer by using inconsistent/stale
 	 * versions of the field, possibly resulting in socket buffer
 	 * corruption.
+	 *
 	 * By holding the high-level sblock(), we prevent simultaneous
 	 * readers from pulling off the front of the socket buffer.
 	 */
 	if (l != NULL)
 		l->l_ru.ru_msgrcv++;
 	KASSERT(m == so->so_rcv.sb_mb);
 	SBLASTRECORDCHK(&so->so_rcv, "soreceive 1");
 	SBLASTMBUFCHK(&so->so_rcv, "soreceive 1");
 	nextrecord = m->m_nextpkt;
 	if (pr->pr_flags & PR_ADDR) {
 #ifdef DIAGNOSTIC
 		if (m->m_type != MT_SONAME)
 			panic("receive 1a");
 #endif
 		orig_resid = 0;
 		if (flags & MSG_PEEK) {
 			if (paddr)
 				*paddr = m_copy(m, 0, m->m_len);
 			m = m->m_next;
 		} else {
 			sbfree(&so->so_rcv, m);
 			mbuf_removed = 1;
 			if (paddr != NULL) {
 				*paddr = m;
 				so->so_rcv.sb_mb = m->m_next;
 				m->m_next = NULL;
 				m = so->so_rcv.sb_mb;
 			} else {
 				MFREE(m, so->so_rcv.sb_mb);
 				m = so->so_rcv.sb_mb;
+			}
 			sbsync(&so->so_rcv, nextrecord);
+		}
+	}
 	/*
 	 * Process one or more MT_CONTROL mbufs present before any data mbufs
 	 * in the first mbuf chain on the socket buffer.  If MSG_PEEK, we
 	 * just copy the data; if !MSG_PEEK, we call into the protocol to
 	 * perform externalization (or freeing if controlp == NULL).
 	 */
 	if (__predict_false(m != NULL && m->m_type == MT_CONTROL)) {
 		struct mbuf *cm = NULL, *cmn;
 		struct mbuf **cme = &cm;
 		do {
 			if (flags & MSG_PEEK) {
 				if (controlp != NULL) {
 					*controlp = m_copy(m, 0, m->m_len);
 					controlp = &(*controlp)->m_next;
+				}
 				m = m->m_next;
 			} else {
 				sbfree(&so->so_rcv, m);
 				so->so_rcv.sb_mb = m->m_next;
 				m->m_next = NULL;
 				*cme = m;
 				cme = &(*cme)->m_next;
 				m = so->so_rcv.sb_mb;
+			}
 		} while (m != NULL && m->m_type == MT_CONTROL);
 		if ((flags & MSG_PEEK) == 0)
 			sbsync(&so->so_rcv, nextrecord);
 		for (; cm != NULL; cm = cmn) {
 			cmn = cm->m_next;
 			cm->m_next = NULL;
 			type = mtod(cm, struct cmsghdr *)->cmsg_type;
 			if (controlp != NULL) {
 				if (dom->dom_externalize != NULL &&
 				    type == SCM_RIGHTS) {
 					sounlock(so);
 					splx(s);
 					error = (*dom->dom_externalize)(cm, l);
 					s = splsoftnet();
 					solock(so);
+				}
 				*controlp = cm;
 				while (*controlp != NULL)
 					controlp = &(*controlp)->m_next;
 			} else {
 				/*
 				 * Dispose of any SCM_RIGHTS message that went
 				 * through the read path rather than recv.
 				 */
 				if (dom->dom_dispose != NULL &&
 				    type == SCM_RIGHTS) {
 				    	sounlock(so);
 					(*dom->dom_dispose)(cm);
 					solock(so);
+				}
 				m_freem(cm);
+			}
+		}
 		if (m != NULL)
 			nextrecord = so->so_rcv.sb_mb->m_nextpkt;
 		else
 			nextrecord = so->so_rcv.sb_mb;
 		orig_resid = 0;
+	}
 	/* If m is non-NULL, we have some data to read. */
 	if (__predict_true(m != NULL)) {
 		type = m->m_type;
 		if (type == MT_OOBDATA)
 			flags |= MSG_OOB;
+	}
 	SBLASTRECORDCHK(&so->so_rcv, "soreceive 2");
 	SBLASTMBUFCHK(&so->so_rcv, "soreceive 2");
 	moff = 0;
 	offset = 0;
 	while (m != NULL && uio->uio_resid > 0 && error == 0) {
 		if (m->m_type == MT_OOBDATA) {
 			if (type != MT_OOBDATA)
 				break;
 		} else if (type == MT_OOBDATA)
 			break;
 #ifdef DIAGNOSTIC
 		else if (m->m_type != MT_DATA && m->m_type != MT_HEADER)
 			panic("receive 3");
 #endif
 		so->so_state &= ~SS_RCVATMARK;
 		len = uio->uio_resid;
 		if (so->so_oobmark && len > so->so_oobmark - offset)
 			len = so->so_oobmark - offset;
 		if (len > m->m_len - moff)
 			len = m->m_len - moff;
 		/*
 		 * If mp is set, just pass back the mbufs.
 		 * Otherwise copy them out via the uio, then free.
 		 * Sockbuf must be consistent here (points to current mbuf,
 		 * it points to next record) when we drop priority;
 		 * we must note any additions to the sockbuf when we
 		 * block interrupts again.
 		 */
 		if (mp == NULL) {
 			SBLASTRECORDCHK(&so->so_rcv, "soreceive uiomove");
 			SBLASTMBUFCHK(&so->so_rcv, "soreceive uiomove");
 			sounlock(so);
 			splx(s);
 			error = uiomove(mtod(m, char *) + moff, (int)len, uio);
 			s = splsoftnet();
 			solock(so);
 			if (error != 0) {
 				/*
 				 * If any part of the record has been removed
 				 * (such as the MT_SONAME mbuf, which will
 				 * happen when PR_ADDR, and thus also
 				 * PR_ATOMIC, is set), then drop the entire
 				 * record to maintain the atomicity of the
 				 * receive operation.
+				 *
 				 * This avoids a later panic("receive 1a")
 				 * when compiled with DIAGNOSTIC.
 				 */
 				if (m && mbuf_removed && atomic)
 					(void) sbdroprecord(&so->so_rcv);
 				goto release;
+			}
 		} else
 			uio->uio_resid -= len;
 		if (len == m->m_len - moff) {
 			if (m->m_flags & M_EOR)
 				flags |= MSG_EOR;
 			if (flags & MSG_PEEK) {
 				m = m->m_next;
 				moff = 0;
 			} else {
 				nextrecord = m->m_nextpkt;
 				sbfree(&so->so_rcv, m);
 				if (mp) {
 					*mp = m;
 					mp = &m->m_next;
 					so->so_rcv.sb_mb = m = m->m_next;
 					*mp = NULL;
 				} else {
 					MFREE(m, so->so_rcv.sb_mb);
 					m = so->so_rcv.sb_mb;
+				}
 				/*
 				 * If m != NULL, we also know that
 				 * so->so_rcv.sb_mb != NULL.
 				 */

 @@ -1,1003 +1,1003 @@
-/* $NetBSD: secmodel_suser.c,v 1.18 2009/10/03 01:30:25 elad Exp $ */
+/* $NetBSD: secmodel_suser.c,v 1.19 2009/10/03 01:41:39 elad Exp $ */
 /*-
  * Copyright (c) 2006 Elad Efrat <elad@NetBSD.org>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * This file contains kauth(9) listeners needed to implement the traditional
  * NetBSD superuser access restrictions.
+ *
  * There are two main resources a request can be issued to: user-owned and
  * system owned. For the first, traditional Unix access checks are done, as
  * well as superuser checks. If needed, the request context is examined before
  * a decision is made. For the latter, usually only superuser checks are done
  * as normal users are not allowed to access system resources.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: secmodel_suser.c,v 1.18 2009/10/03 01:30:25 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: secmodel_suser.c,v 1.19 2009/10/03 01:41:39 elad Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/kauth.h>
 #include <sys/mutex.h>
 #include <sys/mount.h>
 #include <sys/socketvar.h>
 #include <sys/sysctl.h>
 #include <sys/vnode.h>
 #include <sys/proc.h>
 #include <sys/uidinfo.h>
 #include <sys/module.h>
 #include <miscfs/procfs/procfs.h>
 #include <secmodel/suser/suser.h>
 MODULE(MODULE_CLASS_SECMODEL, suser, NULL);
 static int secmodel_bsd44_curtain;
 /* static */ int dovfsusermount;
 static kauth_listener_t l_generic, l_system, l_process, l_network, l_machdep,
     l_device, l_vnode;
 static struct sysctllog *suser_sysctl_log;
 void
 sysctl_security_suser_setup(struct sysctllog **clog)
+{
 	const struct sysctlnode *rnode;
 	sysctl_createv(clog, 0, NULL, &rnode,
 		       CTLFLAG_PERMANENT,
 		       CTLTYPE_NODE, "security", NULL,
 		       NULL, 0, NULL, 0,
 		       CTL_SECURITY, CTL_EOL);
 	sysctl_createv(clog, 0, &rnode, &rnode,
 		       CTLFLAG_PERMANENT,
 		       CTLTYPE_NODE, "models", NULL,
 		       NULL, 0, NULL, 0,
 		       CTL_CREATE, CTL_EOL);
 	sysctl_createv(clog, 0, &rnode, &rnode,
 		       CTLFLAG_PERMANENT,
 		       CTLTYPE_NODE, "suser", NULL,
 		       NULL, 0, NULL, 0,
 		       CTL_CREATE, CTL_EOL);
 	sysctl_createv(clog, 0, &rnode, NULL,
 		       CTLFLAG_PERMANENT,
 		       CTLTYPE_STRING, "name", NULL,
 		       NULL, 0, __UNCONST("Traditional NetBSD: Superuser"), 0,
 		       CTL_CREATE, CTL_EOL);
 	sysctl_createv(clog, 0, &rnode, NULL,
 		       CTLFLAG_PERMANENT|CTLFLAG_READWRITE,
 		       CTLTYPE_INT, "curtain",
 		       SYSCTL_DESCR("Curtain information about objects to "\
 		       		    "users not owning them."),
 		       NULL, 0, &secmodel_bsd44_curtain, 0,
 		       CTL_CREATE, CTL_EOL);
 	sysctl_createv(clog, 0, &rnode, NULL,
 		       CTLFLAG_PERMANENT|CTLFLAG_READWRITE,
 		       CTLTYPE_INT, "usermount",
 		       SYSCTL_DESCR("Whether unprivileged users may mount "
 				    "filesystems"),
 		       NULL, 0, &dovfsusermount, 0,
 		       CTL_CREATE, CTL_EOL);
 	/* Compatibility: security.curtain */
 	sysctl_createv(clog, 0, NULL, &rnode,
 		       CTLFLAG_PERMANENT,
 		       CTLTYPE_NODE, "security", NULL,
 		       NULL, 0, NULL, 0,
 		       CTL_SECURITY, CTL_EOL);
 	sysctl_createv(clog, 0, &rnode, NULL,
 		       CTLFLAG_PERMANENT|CTLFLAG_READWRITE,
 		       CTLTYPE_INT, "curtain",
 		       SYSCTL_DESCR("Curtain information about objects to "\
 		       		    "users not owning them."),
 		       NULL, 0, &secmodel_bsd44_curtain, 0,
 		       CTL_CREATE, CTL_EOL);
 	/* Compatibility: vfs.generic.usermount */
 	sysctl_createv(clog, 0, NULL, NULL,
 		       CTLFLAG_PERMANENT,
 		       CTLTYPE_NODE, "vfs", NULL,
 		       NULL, 0, NULL, 0,
 		       CTL_VFS, CTL_EOL);
 	sysctl_createv(clog, 0, NULL, NULL,
 		       CTLFLAG_PERMANENT,
 		       CTLTYPE_NODE, "generic",
 		       SYSCTL_DESCR("Non-specific vfs related information"),
 		       NULL, 0, NULL, 0,
 		       CTL_VFS, VFS_GENERIC, CTL_EOL);
 	sysctl_createv(clog, 0, NULL, NULL,
 		       CTLFLAG_PERMANENT|CTLFLAG_READWRITE,
 		       CTLTYPE_INT, "usermount",
 		       SYSCTL_DESCR("Whether unprivileged users may mount "
 				    "filesystems"),
 		       NULL, 0, &dovfsusermount, 0,
 		       CTL_VFS, VFS_GENERIC, VFS_USERMOUNT, CTL_EOL);
+}
 void
 secmodel_suser_init(void)
+{
 	secmodel_bsd44_curtain = 0;
 	dovfsusermount = 0;
+}
 void
 secmodel_suser_start(void)
+{
 	l_generic = kauth_listen_scope(KAUTH_SCOPE_GENERIC,
 	    secmodel_suser_generic_cb, NULL);
 	l_system = kauth_listen_scope(KAUTH_SCOPE_SYSTEM,
 	    secmodel_suser_system_cb, NULL);
 	l_process = kauth_listen_scope(KAUTH_SCOPE_PROCESS,
 	    secmodel_suser_process_cb, NULL);
 	l_network = kauth_listen_scope(KAUTH_SCOPE_NETWORK,
 	    secmodel_suser_network_cb, NULL);
 	l_machdep = kauth_listen_scope(KAUTH_SCOPE_MACHDEP,
 	    secmodel_suser_machdep_cb, NULL);
 	l_device = kauth_listen_scope(KAUTH_SCOPE_DEVICE,
 	    secmodel_suser_device_cb, NULL);
 	l_vnode = kauth_listen_scope(KAUTH_SCOPE_VNODE,
 	    secmodel_suser_vnode_cb, NULL);
+}
 void
 secmodel_suser_stop(void)
+{
 	kauth_unlisten_scope(l_generic);
 	kauth_unlisten_scope(l_system);
 	kauth_unlisten_scope(l_process);
 	kauth_unlisten_scope(l_network);
 	kauth_unlisten_scope(l_machdep);
 	kauth_unlisten_scope(l_device);
 	kauth_unlisten_scope(l_vnode);
+}
 static int
 suser_modcmd(modcmd_t cmd, void *arg)
+{
 	int error = 0;
 	switch (cmd) {
 	case MODULE_CMD_INIT:
 		secmodel_suser_init();
 		secmodel_suser_start();
 		sysctl_security_suser_setup(&suser_sysctl_log);
 		break;
 	case MODULE_CMD_FINI:
 		sysctl_teardown(&suser_sysctl_log);
 		secmodel_suser_stop();
 		break;
 	case MODULE_CMD_AUTOUNLOAD:
 		error = EPERM;
 		break;
 	default:
 		error = ENOTTY;
 		break;
+	}
 	return (error);
+}
 /*
  * kauth(9) listener
+ *
  * Security model: Traditional NetBSD
  * Scope: Generic
  * Responsibility: Superuser access
  */
 int
 secmodel_suser_generic_cb(kauth_cred_t cred, kauth_action_t action,
     void *cookie, void *arg0, void *arg1, void *arg2, void *arg3)
+{
 	bool isroot;
 	int result;
 	isroot = (kauth_cred_geteuid(cred) == 0);
 	result = KAUTH_RESULT_DEFER;
 	switch (action) {
 	case KAUTH_GENERIC_ISSUSER:
 		if (isroot)
 			result = KAUTH_RESULT_ALLOW;
 		break;
 	case KAUTH_GENERIC_CANSEE:
 		if (!secmodel_bsd44_curtain)
 			result = KAUTH_RESULT_ALLOW;
 		else if (isroot || kauth_cred_uidmatch(cred, arg0))
 			result = KAUTH_RESULT_ALLOW;
 		break;
 	default:
 		break;
+	}
 	return (result);
+}
 /*
  * kauth(9) listener
+ *
  * Security model: Traditional NetBSD
  * Scope: System
  * Responsibility: Superuser access
  */
 int
 secmodel_suser_system_cb(kauth_cred_t cred, kauth_action_t action,
     void *cookie, void *arg0, void *arg1, void *arg2, void *arg3)
+{
 	bool isroot;
 	int result;
 	enum kauth_system_req req;
 	isroot = (kauth_cred_geteuid(cred) == 0);
 	result = KAUTH_RESULT_DEFER;
 	req = (enum kauth_system_req)arg0;
 	switch (action) {
 	case KAUTH_SYSTEM_CPU:
 		switch (req) {
 		case KAUTH_REQ_SYSTEM_CPU_SETSTATE:
 			if (isroot)
 				result = KAUTH_RESULT_ALLOW;
 			break;
 		default:
 			break;
+		}
 		break;
 	case KAUTH_SYSTEM_FS_QUOTA:
 		switch (req) {
 		case KAUTH_REQ_SYSTEM_FS_QUOTA_GET:
 		case KAUTH_REQ_SYSTEM_FS_QUOTA_ONOFF:
 		case KAUTH_REQ_SYSTEM_FS_QUOTA_MANAGE:
 		case KAUTH_REQ_SYSTEM_FS_QUOTA_NOLIMIT:
 			if (isroot)
 				result = KAUTH_RESULT_ALLOW;
 			break;
 		default:
 			break;
+		}
 		break;
 	case KAUTH_SYSTEM_FS_RESERVEDSPACE:
 		if (isroot)
 			result = KAUTH_RESULT_ALLOW;
 		break;
 	case KAUTH_SYSTEM_MOUNT:
 		switch (req) {
 		case KAUTH_REQ_SYSTEM_MOUNT_GET:
 			result = KAUTH_RESULT_ALLOW;
 			break;
 		case KAUTH_REQ_SYSTEM_MOUNT_NEW:
 			if (isroot)
 				result = KAUTH_RESULT_ALLOW;
 			else if (dovfsusermount) {
 				struct vnode *vp = arg1;
 				u_long flags = (u_long)arg2;
 				if (!(flags & MNT_NODEV) ||
 				    !(flags & MNT_NOSUID))
 					break;
 				if ((vp->v_mount->mnt_flag & MNT_NOEXEC) &&
 				    !(flags & MNT_NOEXEC))
 					break;
 				result = KAUTH_RESULT_ALLOW;
+			}
 			break;
 		case KAUTH_REQ_SYSTEM_MOUNT_UNMOUNT:
 			if (isroot)
 				result = KAUTH_RESULT_ALLOW;
 			else {
 				struct mount *mp = arg1;
 				if (mp->mnt_stat.f_owner ==
 				    kauth_cred_geteuid(cred))
 					result = KAUTH_RESULT_ALLOW;
+			}
 			break;
 		case KAUTH_REQ_SYSTEM_MOUNT_UPDATE:
 			if (isroot)
 				result = KAUTH_RESULT_ALLOW;
 			else if (dovfsusermount) {
 				struct mount *mp = arg1;
 				u_long flags = (u_long)arg2;
 				/* No exporting for non-root. */
 				if (flags & MNT_EXPORTED)
 					break;
 				if (!(flags & MNT_NODEV) ||
 				    !(flags & MNT_NOSUID))
 					break;
 				/*
 				 * Only super-user, or user that did the mount,
 				 * can update.
 				 */
 				if (mp->mnt_stat.f_owner !=
 				    kauth_cred_geteuid(cred))
 					break;
 				/* Retain 'noexec'. */
 				if ((mp->mnt_flag & MNT_NOEXEC) &&
 				    !(flags & MNT_NOEXEC))
 					break;
 				result = KAUTH_RESULT_ALLOW;
+			}
 			break;
 		default:
 			break;
+		}
 		break;
 	case KAUTH_SYSTEM_PSET:
 		switch (req) {
 		case KAUTH_REQ_SYSTEM_PSET_ASSIGN:
 		case KAUTH_REQ_SYSTEM_PSET_BIND:
 		case KAUTH_REQ_SYSTEM_PSET_CREATE:
 		case KAUTH_REQ_SYSTEM_PSET_DESTROY:
 			if (isroot)
 				result = KAUTH_RESULT_ALLOW;
 			break;
 		default:
 			break;
+		}
 		break;
 	case KAUTH_SYSTEM_TIME:
 		switch (req) {
 		case KAUTH_REQ_SYSTEM_TIME_ADJTIME:
 		case KAUTH_REQ_SYSTEM_TIME_NTPADJTIME:
 		case KAUTH_REQ_SYSTEM_TIME_TIMECOUNTERS:
 			if (isroot)
 				result = KAUTH_RESULT_ALLOW;
 			break;
 		case KAUTH_REQ_SYSTEM_TIME_SYSTEM: {
 			bool device_context = (bool)arg3;
 			if (device_context || isroot)
 				result = KAUTH_RESULT_ALLOW;
 			break;
+		}
 		case KAUTH_REQ_SYSTEM_TIME_RTCOFFSET:
 			if (isroot)
 				result = KAUTH_RESULT_ALLOW;
 			break;
 		default:
 			break;
+		}
 		break;
 	case KAUTH_SYSTEM_SYSCTL:
 		switch (req) {
 		case KAUTH_REQ_SYSTEM_SYSCTL_ADD:
 		case KAUTH_REQ_SYSTEM_SYSCTL_DELETE:
 		case KAUTH_REQ_SYSTEM_SYSCTL_DESC:
 		case KAUTH_REQ_SYSTEM_SYSCTL_MODIFY:
 		case KAUTH_REQ_SYSTEM_SYSCTL_PRVT:
 			if (isroot)
 				result = KAUTH_RESULT_ALLOW;
 			break;
 		default:
 			break;
+		}
 		break;
 	case KAUTH_SYSTEM_SWAPCTL:
 	case KAUTH_SYSTEM_ACCOUNTING:
 	case KAUTH_SYSTEM_REBOOT:
 	case KAUTH_SYSTEM_CHROOT:
 	case KAUTH_SYSTEM_FILEHANDLE:
 	case KAUTH_SYSTEM_MKNOD:
 		if (isroot)
 			result = KAUTH_RESULT_ALLOW;
 		break;
 	case KAUTH_SYSTEM_CHSYSFLAGS:
 		/*
 		 * Needs to be checked in conjunction with the immutable and
 		 * append-only flags (usually). Should be handled differently.
 		 * Infects ufs, ext2fs, tmpfs, and rump.
 		 */
 		if (isroot)
 			result = KAUTH_RESULT_ALLOW;
 		break;
 	case KAUTH_SYSTEM_SETIDCORE:
 		if (isroot)
 			result = KAUTH_RESULT_ALLOW;
 		break;
 	case KAUTH_SYSTEM_MODULE:
 		if (isroot)
 			result = KAUTH_RESULT_ALLOW;
 		break;
 	default:
 		break;
+	}
 	return (result);
+}
 /*
  * kauth(9) listener
+ *
  * Security model: Traditional NetBSD
  * Scope: Process
  * Responsibility: Superuser access
  */
 int
 secmodel_suser_process_cb(kauth_cred_t cred, kauth_action_t action,
     void *cookie, void *arg0, void *arg1, void *arg2, void *arg3)
+{
 	struct proc *p;
 	bool isroot;
 	int result;
 	isroot = (kauth_cred_geteuid(cred) == 0);
 	result = KAUTH_RESULT_DEFER;
 	p = arg0;
 	switch (action) {
 	case KAUTH_PROCESS_SIGNAL:
 		if (isroot)
 			result = KAUTH_RESULT_ALLOW;
 		break;
 	case KAUTH_PROCESS_CANSEE: {
 		unsigned long req;
 		req = (unsigned long)arg1;
 		switch (req) {
 		case KAUTH_REQ_PROCESS_CANSEE_ARGS:
 		case KAUTH_REQ_PROCESS_CANSEE_ENTRY:
 		case KAUTH_REQ_PROCESS_CANSEE_OPENFILES:
 			if (!secmodel_bsd44_curtain)
 				result = KAUTH_RESULT_ALLOW;
 			else if (isroot || kauth_cred_uidmatch(cred, p->p_cred))
 				result = KAUTH_RESULT_ALLOW;
 			break;
 		case KAUTH_REQ_PROCESS_CANSEE_ENV:
 			if (!isroot &&
 			    (kauth_cred_getuid(cred) !=
 			     kauth_cred_getuid(p->p_cred) ||
 			    kauth_cred_getuid(cred) !=
 			     kauth_cred_getsvuid(p->p_cred)))
 				break;
 			else
 				result = KAUTH_RESULT_ALLOW;
 			break;
 		default:
 			break;
+		}
 		break;
+		}
 	case KAUTH_PROCESS_KTRACE:
 		if (isroot)
 			result = KAUTH_RESULT_ALLOW;
 		break;
 	case KAUTH_PROCESS_PROCFS:
 		if (isroot)
 			result = KAUTH_RESULT_ALLOW;
 		break;
 	case KAUTH_PROCESS_PTRACE:
 		if (isroot)
 			result = KAUTH_RESULT_ALLOW;
 		break;
 	case KAUTH_PROCESS_CORENAME:
 		if (isroot || proc_uidmatch(cred, p->p_cred) == 0)
 			result = KAUTH_RESULT_ALLOW;
 		break;
 	case KAUTH_PROCESS_FORK: {
 		int lnprocs = (int)(unsigned long)arg2;
 		/*
 		 * Don't allow a nonprivileged user to use the last few
 		 * processes. The variable lnprocs is the current number of
 		 * processes, maxproc is the limit.
 		 */
 		if (__predict_false((lnprocs >= maxproc - 5) && !isroot))
 			break;
 		else
 			result = KAUTH_RESULT_ALLOW;
 		break;
+		}
 	case KAUTH_PROCESS_KEVENT_FILTER:
 		if (isroot)
 			result = KAUTH_RESULT_ALLOW;
 		break;
 	case KAUTH_PROCESS_NICE:
 		if (isroot)
 			result = KAUTH_RESULT_ALLOW;
 		break;
 	case KAUTH_PROCESS_RLIMIT: {
 		enum kauth_process_req req;
 		req = (enum kauth_process_req)(unsigned long)arg1;
 		switch (req) {
 		case KAUTH_REQ_PROCESS_RLIMIT_SET:
 		case KAUTH_REQ_PROCESS_RLIMIT_GET:
 			if (isroot)
 				result = KAUTH_RESULT_ALLOW;
 			break;
 		default:
 			break;
+		}
 		break;
+		}
 	case KAUTH_PROCESS_SCHEDULER_GETPARAM:
 	case KAUTH_PROCESS_SCHEDULER_SETPARAM:
 	case KAUTH_PROCESS_SCHEDULER_SETAFFINITY:
 		if (isroot)
 			result = KAUTH_RESULT_ALLOW;
 		break;
 	case KAUTH_PROCESS_SETID:
 		if (isroot)
 			result = KAUTH_RESULT_ALLOW;
 		break;
 	case KAUTH_PROCESS_STOPFLAG:
 		if (isroot || proc_uidmatch(cred, p->p_cred) == 0) {
 			result = KAUTH_RESULT_ALLOW;
 			break;
+		}
 		break;
 	default:
 		break;
+	}
 	return (result);
+}
 /*
  * kauth(9) listener
+ *
  * Security model: Traditional NetBSD
  * Scope: Network
  * Responsibility: Superuser access
  */
 int
 secmodel_suser_network_cb(kauth_cred_t cred, kauth_action_t action,
     void *cookie, void *arg0, void *arg1, void *arg2, void *arg3)
+{
 	bool isroot;
 	int result;
 	enum kauth_network_req req;
 	isroot = (kauth_cred_geteuid(cred) == 0);
 	result = KAUTH_RESULT_DEFER;
 	req = (enum kauth_network_req)arg0;
 	switch (action) {
 	case KAUTH_NETWORK_ALTQ:
 		switch (req) {
 		case KAUTH_REQ_NETWORK_ALTQ_AFMAP:
 		case KAUTH_REQ_NETWORK_ALTQ_BLUE:
 		case KAUTH_REQ_NETWORK_ALTQ_CBQ:
 		case KAUTH_REQ_NETWORK_ALTQ_CDNR:
 		case KAUTH_REQ_NETWORK_ALTQ_CONF:
 		case KAUTH_REQ_NETWORK_ALTQ_FIFOQ:
 		case KAUTH_REQ_NETWORK_ALTQ_HFSC:
 		case KAUTH_REQ_NETWORK_ALTQ_JOBS:
 		case KAUTH_REQ_NETWORK_ALTQ_PRIQ:
 		case KAUTH_REQ_NETWORK_ALTQ_RED:
 		case KAUTH_REQ_NETWORK_ALTQ_RIO:
 		case KAUTH_REQ_NETWORK_ALTQ_WFQ:
 			if (isroot)
 				result = KAUTH_RESULT_ALLOW;
 			break;
 		default:
 			break;
+		}
 		break;
 	case KAUTH_NETWORK_BIND:
 		switch (req) {
 		case KAUTH_REQ_NETWORK_BIND_PORT:
 			result = KAUTH_RESULT_ALLOW;
 			break;
 		case KAUTH_REQ_NETWORK_BIND_PRIVPORT:
 			if (isroot)
 				result = KAUTH_RESULT_ALLOW;
 			break;
 		default:
 			break;
+		}
 		break;
 	case KAUTH_NETWORK_FORWSRCRT:
 		if (isroot)
 			result = KAUTH_RESULT_ALLOW;
 		break;
 	case KAUTH_NETWORK_INTERFACE:
 		switch (req) {
 		case KAUTH_REQ_NETWORK_INTERFACE_GET:
 		case KAUTH_REQ_NETWORK_INTERFACE_SET:
 			result = KAUTH_RESULT_ALLOW;
 			break;
 		case KAUTH_REQ_NETWORK_INTERFACE_GETPRIV:
 		case KAUTH_REQ_NETWORK_INTERFACE_SETPRIV:
 			if (isroot)
 				result = KAUTH_RESULT_ALLOW;
 			break;
 		default:
 			break;
+		}
 		break;
 	case KAUTH_NETWORK_INTERFACE_PPP:
 		switch (req) {
 		case KAUTH_REQ_NETWORK_INTERFACE_PPP_ADD:
 			if (isroot)
 				result = KAUTH_RESULT_ALLOW;
 			break;
 		default:
 			break;
+		}
 		break;
 	case KAUTH_NETWORK_INTERFACE_SLIP:
 		switch (req) {
 		case KAUTH_REQ_NETWORK_INTERFACE_SLIP_ADD:
 			if (isroot)
 				result = KAUTH_RESULT_ALLOW;
 			break;
 		default:
 			break;
+		}
 		break;
 	case KAUTH_NETWORK_INTERFACE_STRIP:
 		switch (req) {
 		case KAUTH_REQ_NETWORK_INTERFACE_STRIP_ADD:
 			if (isroot)
 				result = KAUTH_RESULT_ALLOW;
 			break;
 		default:
 			break;
+		}
 		break;
 	case KAUTH_NETWORK_INTERFACE_TUN:
 		switch (req) {
 		case KAUTH_REQ_NETWORK_INTERFACE_TUN_ADD:
 			if (isroot)
 				result = KAUTH_RESULT_ALLOW;
 			break;
 		default:
 			break;
+		}
 		break;
 	case KAUTH_NETWORK_NFS:
 		switch (req) {
 		case KAUTH_REQ_NETWORK_NFS_EXPORT:
 		case KAUTH_REQ_NETWORK_NFS_SVC:
 			if (isroot)
 				result = KAUTH_RESULT_ALLOW;
 			break;
 		default:
 			break;
+		}
 		break;
 	case KAUTH_NETWORK_ROUTE:
 		if (isroot)
 			result = KAUTH_RESULT_ALLOW;
 		break;
 	case KAUTH_NETWORK_SOCKET:
 		switch (req) {
 		case KAUTH_REQ_NETWORK_SOCKET_DROP:
 		case KAUTH_REQ_NETWORK_SOCKET_OPEN:
 		case KAUTH_REQ_NETWORK_SOCKET_RAWSOCK:
 		case KAUTH_REQ_NETWORK_SOCKET_SETPRIV:
 			if (isroot)
 				result = KAUTH_RESULT_ALLOW;
 			break;
 		case KAUTH_REQ_NETWORK_SOCKET_CANSEE:
 			if (isroot) {
 				result = KAUTH_RESULT_ALLOW;
 				break;
+			}
 			if (secmodel_bsd44_curtain) {
 				struct socket *so;
 				uid_t so_uid;
-				so_uid =
+				so = (struct socket *)arg1;
-				    ((struct socket *)arg1)->so_uidinfo->ui_uid;
+				so_uid = so->so_uidinfo->ui_uid;
-				if (kauth_cred_geteuid(cred) == so_uid)
+				if (kauth_cred_geteuid(cred) != so_uid)
-					result = KAUTH_RESULT_ALLOW;
+					result = KAUTH_RESULT_DENY;
 			} else
 				result = KAUTH_RESULT_ALLOW;
 			break;
 		default:
 			break;
+		}
 		break;
 	default:
 		break;
+	}
 	return (result);
+}
 /*
  * kauth(9) listener
+ *
  * Security model: Traditional NetBSD
  * Scope: Machdep
  * Responsibility: Superuser access
  */
 int
 secmodel_suser_machdep_cb(kauth_cred_t cred, kauth_action_t action,
     void *cookie, void *arg0, void *arg1, void *arg2, void *arg3)
+{
         bool isroot;
         int result;
         isroot = (kauth_cred_geteuid(cred) == 0);
         result = KAUTH_RESULT_DEFER;
         switch (action) {
 	case KAUTH_MACHDEP_IOPERM_GET:
 	case KAUTH_MACHDEP_LDT_GET:
 	case KAUTH_MACHDEP_LDT_SET:
 	case KAUTH_MACHDEP_MTRR_GET:
 		result = KAUTH_RESULT_ALLOW;
 		break;
 	case KAUTH_MACHDEP_CACHEFLUSH:
 	case KAUTH_MACHDEP_IOPERM_SET:
 	case KAUTH_MACHDEP_IOPL:
 	case KAUTH_MACHDEP_MTRR_SET:
 	case KAUTH_MACHDEP_NVRAM:
 	case KAUTH_MACHDEP_UNMANAGEDMEM:
 		if (isroot)
 			result = KAUTH_RESULT_ALLOW;
 		break;
 	default:
 		break;
+	}
 	return (result);
+}
 /*
  * kauth(9) listener
+ *
  * Security model: Traditional NetBSD
  * Scope: Device
  * Responsibility: Superuser access
  */
 int
 secmodel_suser_device_cb(kauth_cred_t cred, kauth_action_t action,
     void *cookie, void *arg0, void *arg1, void *arg2, void *arg3)
+{
         bool isroot;
         int result;
         isroot = (kauth_cred_geteuid(cred) == 0);
         result = KAUTH_RESULT_DEFER;
 	switch (action) {
 	case KAUTH_DEVICE_BLUETOOTH_SETPRIV:
 	case KAUTH_DEVICE_BLUETOOTH_SEND:
 	case KAUTH_DEVICE_BLUETOOTH_RECV:
 		if (isroot)
 			result = KAUTH_RESULT_ALLOW;
 		break;
 	case KAUTH_DEVICE_BLUETOOTH_BCSP:
 	case KAUTH_DEVICE_BLUETOOTH_BTUART: {
 		enum kauth_device_req req;
 		req = (enum kauth_device_req)arg0;
 		switch (req) {
 		case KAUTH_REQ_DEVICE_BLUETOOTH_BCSP_ADD:
 		case KAUTH_REQ_DEVICE_BLUETOOTH_BTUART_ADD:
 			if (isroot)
 				result = KAUTH_RESULT_ALLOW;
 			break;
 		default:
 			break;
+		}
 		break;
+		}
 	case KAUTH_DEVICE_RAWIO_SPEC:
 	case KAUTH_DEVICE_RAWIO_PASSTHRU:
 		/*
 		 * Decision is root-agnostic.
+		 *
 		 * Both requests can be issued on devices subject to their
 		 * permission bits.
 		 */
 		result = KAUTH_RESULT_ALLOW;
 		break;
 	case KAUTH_DEVICE_TTY_OPEN:
 		if (isroot)
 			result = KAUTH_RESULT_ALLOW;
 		break;
 	case KAUTH_DEVICE_TTY_PRIVSET:
 		if (isroot)
 			result = KAUTH_RESULT_ALLOW;
 		break;
 	case KAUTH_DEVICE_TTY_STI:
 		if (isroot)
 			result = KAUTH_RESULT_ALLOW;
 		break;
 	case KAUTH_DEVICE_RND_ADDDATA:
 	case KAUTH_DEVICE_RND_GETPRIV:
 	case KAUTH_DEVICE_RND_SETPRIV:
 		if (isroot)
 			result = KAUTH_RESULT_ALLOW;
 		break;
 	case KAUTH_DEVICE_GPIO_PINSET:
 		/*
 		 * root can access gpio pins, secmodel_securlevel can veto
 		 * this decision.
 		 */
 		if (isroot)
 			result = KAUTH_RESULT_ALLOW;
 		break;
 	default:
 		break;
+	}
 	return (result);
+}
 int
 secmodel_suser_vnode_cb(kauth_cred_t cred, kauth_action_t action,
     void *cookie, void *arg0, void *arg1, void *arg2, void *arg3)
+{
 	bool isroot;
 	int result;
 	isroot = (kauth_cred_geteuid(cred) == 0);
 	result = KAUTH_RESULT_DEFER;
 	if (isroot)
 		result = KAUTH_RESULT_ALLOW;
 	return (result);
+}