Mon Jul 30 10:45:03 2012 UTC ()

remove infinite loop on error, extra parens on return.


(christos)

diff -r1.138 -r1.139 src/sys/kern/uipc_usrreq.c

--- src/sys/kern/uipc_usrreq.c 2012/07/30 10:42:24	1.138
+++ src/sys/kern/uipc_usrreq.c 2012/07/30 10:45:03	1.139

 @@ -1,14 +1,14 @@
-/*	$NetBSD: uipc_usrreq.c,v 1.138 2012/07/30 10:42:24 christos Exp $	*/
+/*	$NetBSD: uipc_usrreq.c,v 1.139 2012/07/30 10:45:03 christos Exp $	*/
 /*-
  * Copyright (c) 1998, 2000, 2004, 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 the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center, 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
 @@ -86,27 +86,27 @@
  * 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_usrreq.c	8.9 (Berkeley) 5/14/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.138 2012/07/30 10:42:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.139 2012/07/30 10:45:03 christos Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/filedesc.h>
 #include <sys/domain.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/unpcb.h>
 #include <sys/un.h>
 #include <sys/namei.h>
 #include <sys/vnode.h>
 @@ -1331,32 +1331,31 @@ unp_externalize(struct mbuf *rights, str
 	 */
 	if (sizeof(file_t *) != sizeof(int)) {
 		cm->cmsg_len = CMSG_LEN(nfds * sizeof(int));
 		rights->m_len = CMSG_SPACE(nfds * sizeof(int));
+	}
  out:
 	if (__predict_false(error != 0)) {
 		rp = (file_t **)CMSG_DATA(cm);
 		for (size_t i = 0; i < nfds; i++) {
 			file_t * const fp = *rp;
 			*rp++ = 0;
 			unp_discard_now(fp);
+		}
 		goto out;
+	}
 	rw_exit(&p->p_cwdi->cwdi_lock);
 	kmem_free(fdp, nfds * sizeof(int));
-	return (error);
+	return error;
+}
 int
 unp_internalize(struct mbuf **controlp)
+{
 	filedesc_t *fdescp = curlwp->l_fd;
 	struct mbuf *control = *controlp;
 	struct cmsghdr *newcm, *cm = mtod(control, struct cmsghdr *);
 	file_t **rp, **files;
 	file_t *fp;
 	int i, fd, *fdp;
 	int nfds, error;
 	u_int maxmsg;