 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_socket.c,v 1.100 2009/06/11 19:57:58 njoly Exp $	*/
+/*	$NetBSD: linux_socket.c,v 1.101 2009/06/16 15:56:10 njoly Exp $	*/
 /*-
  * Copyright (c) 1995, 1998, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Frank van der Linden and Eric Haszlakiewicz.
+ *
  * 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.
 @@ -25,27 +25,27 @@
  * 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.
  */
 /*
  * Functions in multiarch:
  *	linux_sys_socketcall		: linux_socketcall.c
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.100 2009/06/11 19:57:58 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.101 2009/06/16 15:56:10 njoly Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
 #endif /* defined(_KERNEL_OPT) */
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/malloc.h>
 #include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/file.h>
 @@ -531,26 +531,29 @@ linux_sys_sendmsg(struct lwp *l, const s
 			cidx += cspace;
 		} while ((l_cc = LINUX_CMSG_NXTHDR(&msg, l_cc)) && resid > 0);
 		/* If we allocated a buffer, attach to mbuf */
 		if (cidx > MLEN) {
 			MEXTADD(ctl_mbuf, control, clen, M_MBUF, NULL, NULL);
 			ctl_mbuf->m_flags |= M_EXT_RW;
+		}
 		control = NULL;
 		ctl_mbuf->m_len = cidx;
 		msg.msg_control = ctl_mbuf;
 		msg.msg_flags |= MSG_CONTROLMBUF;
 		ktrkuser("msgcontrol", mtod(ctl_mbuf, void *),
 		    msg.msg_controllen);
+	}
 	error = do_sys_sendmsg(l, SCARG(uap, s), &msg, bflags, retval);
 	/* Freed internally */
 	ctl_mbuf = NULL;
 done:
 	if (ctl_mbuf != NULL) {
 		if (control != NULL && control != mtod(ctl_mbuf, void *))
 			free(control, M_MBUF);
 		m_free(ctl_mbuf);
+	}
 	return (error);
 @@ -591,26 +594,28 @@ linux_copyout_msg_control(struct lwp *l,
+{
 	int dlen, error = 0;
 	struct cmsghdr *cmsg;
 	struct linux_cmsghdr linux_cmsg;
 	struct mbuf *m;
 	char *q, *q_end;
 	if (mp->msg_controllen <= 0 || control == 0) {
 		mp->msg_controllen = 0;
 		free_control_mbuf(l, control, control);
 		return 0;
+	}
 	ktrkuser("msgcontrol", mtod(control, void *), mp->msg_controllen);
 	q = (char *)mp->msg_control;
 	q_end = q + mp->msg_controllen;
 	for (m = control; m != NULL; ) {
 		cmsg = mtod(m, struct cmsghdr *);
 		/*
 		 * Fixup cmsg. We handle two things:
 		 * 0. different sizeof cmsg_len.
 		 * 1. different values for level/type on some archs
 		 * 2. different alignment of CMSG_DATA on some archs
 		 */
 		linux_cmsg.cmsg_len = cmsg->cmsg_len - LINUX_CMSG_ALIGN_DELTA;
 @@ -715,28 +720,30 @@ linux_sys_recvmsg(struct lwp *l, const s
 		error = copyout_sockname(msg.msg_name, &msg.msg_namelen, 0,
 			from);
 	} else
 		msg.msg_namelen = 0;
 	if (from != NULL)
 		m_free(from);
 	if (error == 0) {
 		msg.msg_flags = bsd_to_linux_msg_flags(msg.msg_flags);
 		if (msg.msg_flags < 0)
 			/* Some flag unsupported by Linux */
 			error = EINVAL;
-		else
+		else {
 			ktrkuser("msghdr", &msg, sizeof(msg));
 			error = copyout(&msg, SCARG(uap, msg), sizeof(msg));
+		}
+	}
 	return (error);
+}
 /*
  * Convert socket option level from Linux to NetBSD value. Only SOL_SOCKET
  * is different, the rest matches IPPROTO_* on both systems.
  */
 int
 linux_to_bsd_sopt_level(int llevel)
+{