CVS commit: [netbsd-8] src/sys/compat/linux/common

[Martin Husemann]

Module Name:    src
Committed By:   martin
Date:           Sat Dec  8 12:24:18 UTC 2018

Modified Files:
        src/sys/compat/linux/common [netbsd-8]: linux_socket.c

Log Message:
Apply patch, requested by tsutsui in ticket #1132:

Different solution for the fix in

        sys/compat/linux/common/linux_socket.c  rev 1.140

The solution in -current could not be directly used as it required a kernel
version bump and broke the ABI. Work around it differently here.

Fixes linux emulation of sendto(2), PR 53103.


To generate a diff of this commit:
cvs rdiff -u -r1.138.6.2 -r1.138.6.3 \
    src/sys/compat/linux/common/linux_socket.c

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


Modified files:

Index: src/sys/compat/linux/common/linux_socket.c
diff -u src/sys/compat/linux/common/linux_socket.c:1.138.6.2 src/sys/compat/linux/common/linux_socket.c:1.138.6.3
--- src/sys/compat/linux/common/linux_socket.c:1.138.6.2	Sat May 12 10:29:08 2018
+++ src/sys/compat/linux/common/linux_socket.c	Sat Dec  8 12:24:18 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_socket.c,v 1.138.6.2 2018/05/12 10:29:08 martin Exp $	*/
+/*	$NetBSD: linux_socket.c,v 1.138.6.3 2018/12/08 12:24:18 martin Exp $	*/
 
 /*-
  * Copyright (c) 1995, 1998, 2008 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.138.6.2 2018/05/12 10:29:08 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.138.6.3 2018/12/08 12:24:18 martin Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
@@ -401,6 +401,7 @@ linux_sys_sendto(struct lwp *l, const st
 	struct msghdr   msg;
 	struct iovec    aiov;
 	struct sockaddr_big nam;
+	struct mbuf *m;
 	int bflags;
 	int error;
 
@@ -415,13 +416,31 @@ linux_sys_sendto(struct lwp *l, const st
 	msg.msg_control = NULL;
 
 	if (SCARG(uap, tolen)) {
+		size_t solen;
+
 		/* Read in and convert the sockaddr */
 		error = linux_get_sa(l, SCARG(uap, s), &nam, SCARG(uap, to),
 		    SCARG(uap, tolen));
 		if (error)
 			return (error);
-		msg.msg_name = &nam;
-		msg.msg_namelen = SCARG(uap, tolen);
+
+		/*
+		 * XXX
+		 * Copy sockaddr_big to mbuf because sockargs() called from
+		 * do_sys_sendmsg_so() can't handle sockaddr in msg_name
+		 * already copied into the kernel space.
+		 */
+		solen = nam.sb_len;
+		m = m_get(M_WAIT, MT_SONAME);
+		if (solen > MLEN) {
+			MEXTMALLOC(m, solen, M_WAITOK);
+		}
+		m->m_len = solen;
+		memcpy(mtod(m, void *), &nam, solen);
+
+		msg.msg_flags |= MSG_NAMEMBUF;
+		msg.msg_name = m;
+		msg.msg_namelen = solen;
 	}
 
 	msg.msg_iov = &aiov;