From c1c947534ab441dc28676d1fadec5fb78d92c4d5 Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Tue, 12 Jul 2016 13:19:14 +0000
Subject: [PATCH] The check for pledge "recvfd" was mistakenly only being
 performed for chroot'd processes. ok stefan semarie

---
 sys/kern/uipc_usrreq.c | 42 +++++++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c
index 3a5b7eadf4e..60e4f11b41f 100644
--- a/sys/kern/uipc_usrreq.c
+++ b/sys/kern/uipc_usrreq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uipc_usrreq.c,v 1.97 2016/04/25 20:18:31 tedu Exp $	*/
+/*	$OpenBSD: uipc_usrreq.c,v 1.98 2016/07/12 13:19:14 deraadt Exp $	*/
 /*	$NetBSD: uipc_usrreq.c,v 1.18 1996/02/09 19:00:50 christos Exp $	*/
 
 /*
@@ -673,36 +673,32 @@ unp_externalize(struct mbuf *rights, socklen_t controllen, int flags)
 		goto restart;
 	}
 
+	/* Make sure the recipient should be able to see the descriptors.. */
 	rp = (struct file **)CMSG_DATA(cm);
+	for (i = 0; i < nfds; i++) {
+		fp = *rp++;
+		error = pledge_recvfd(p, fp);
+		if (error)
+			break;
 
-	fdp = mallocarray(nfds, sizeof(int), M_TEMP, M_WAITOK);
-
-	/* Make sure the recipient should be able to see the descriptors.. */
-	if (p->p_fd->fd_rdir != NULL) {
-		rp = (struct file **)CMSG_DATA(cm);
-		for (i = 0; i < nfds; i++) {
-			fp = *rp++;
+		/*
+		 * No to block devices.  If passing a directory,
+		 * make sure that it is underneath the root.
+		 */
+		if (p->p_fd->fd_rdir != NULL && fp->f_type == DTYPE_VNODE) {
+			struct vnode *vp = (struct vnode *)fp->f_data;
 
-			error = pledge_recvfd(p, fp);
-			if (error)
+			if (vp->v_type == VBLK ||
+			    (vp->v_type == VDIR &&
+			    !vn_isunder(vp, p->p_fd->fd_rdir, p))) {
+				error = EPERM;
 				break;
-			/*
-			 * No to block devices.  If passing a directory,
-			 * make sure that it is underneath the root.
-			 */
-			if (fp->f_type == DTYPE_VNODE) {
-				struct vnode *vp = (struct vnode *)fp->f_data;
-
-				if (vp->v_type == VBLK ||
-				    (vp->v_type == VDIR &&
-				    !vn_isunder(vp, p->p_fd->fd_rdir, p))) {
-					error = EPERM;
-					break;
-				}
 			}
 		}
 	}
 
+	fdp = mallocarray(nfds, sizeof(int), M_TEMP, M_WAITOK);
+
 restart:
 	fdplock(p->p_fd);
 	if (error != 0) {
-- 
2.20.1