workaround broken msghdr struct on 64bit linux

POSIX clearly specifies the type of msg_iovlen and msg_controllen, and
Linux ignores it and makes them both size_t instead. to work around
this we add padding (instead of just using the wrong types like glibc
does), but we also need to patch-up the struct before passing it to
the kernel in case the caller did not zero-fill it.

if i could trust the kernel to just ignore the upper 32 bits, this
would not be necessary, but i don't think it will ignore them...

1 files changed, 12 insertions, 0 deletions

diff --git a/src/network/recvmsg.c b/src/network/recvmsg.c
index edc5f241..65094fc8 100644
--- a/src/network/recvmsg.c
+++ b/src/network/recvmsg.c
@@ -1,12 +1,24 @@
 #include <sys/socket.h>
+#include <limits.h>
 #include "syscall.h"
 #include "libc.h"
 
 ssize_t recvmsg(int fd, struct msghdr *msg, int flags)
 {
 	ssize_t r;
+#if LONG_MAX > INT_MAX
+	struct msghdr h, *orig = msg;
+	if (msg) {
+		h = *msg;
+		h.__pad1 = h.__pad2 = 0;
+		msg = &h;
+	}
+#endif
 	CANCELPT_BEGIN;
 	r = socketcall(recvmsg, fd, msg, flags, 0, 0, 0);
 	CANCELPT_END;
+#if LONG_MAX > INT_MAX
+	if (orig) *orig = h;
+#endif
 	return r;
 }