Module Name: src
Committed By: martin
Date: Tue Oct 31 12:43:57 UTC 2017
Modified Files:
src/sys/compat/netbsd32: netbsd32_conv.h
Log Message:
PR kern/52681: fix msghdr conversion.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/compat/netbsd32/netbsd32_conv.h
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/netbsd32/netbsd32_conv.h
diff -u src/sys/compat/netbsd32/netbsd32_conv.h:1.32 src/sys/compat/netbsd32/netbsd32_conv.h:1.33
--- src/sys/compat/netbsd32/netbsd32_conv.h:1.32 Mon Jul 31 15:38:01 2017
+++ src/sys/compat/netbsd32/netbsd32_conv.h Tue Oct 31 12:43:56 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_conv.h,v 1.32 2017/07/31 15:38:01 maxv Exp $ */
+/* $NetBSD: netbsd32_conv.h,v 1.33 2017/10/31 12:43:56 martin Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -280,10 +280,10 @@ static __inline void
netbsd32_from_msghdr(struct netbsd32_msghdr *mhp32, const struct msghdr *mhp)
{
- mhp32->msg_name = mhp32->msg_name;
- mhp32->msg_namelen = mhp32->msg_namelen;
- mhp32->msg_iovlen = mhp32->msg_iovlen;
- mhp32->msg_control = mhp32->msg_control;
+ NETBSD32PTR32(mhp32->msg_name, mhp->msg_name);
+ mhp32->msg_namelen = mhp->msg_namelen;
+ mhp32->msg_iovlen = mhp->msg_iovlen;
+ NETBSD32PTR32(mhp32->msg_control, mhp->msg_control);
mhp32->msg_controllen = mhp->msg_controllen;
mhp32->msg_flags = mhp->msg_flags;
}
