From b0039d6972f631ca7fdff2379d50ad31c3781a7d Mon Sep 17 00:00:00 2001
From: Justus Winter <4winter@informatik.uni-hamburg.de>
Date: Sun, 8 Jun 2014 11:17:08 +0200
Subject: device: fix net_rcv_msg-messages

Previously, all net_rcv_msg-messages sent by net_deliver were
malformed.  It never was a problem in practice, since the messages are
not complex and thus the kernel does not try to parse the message.

struct net_rcv_msg contains an additional field of type boolean_t.
This field has no associated type descriptor, so it must not be
included in the message.

* device/net_io.c (net_deliver): Account for the extra field in the
msgh_size calculation.
---
 device/net_io.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'device')

diff --git a/device/net_io.c b/device/net_io.c
index 82b6fb92..a9d318e4 100644
--- a/device/net_io.c
+++ b/device/net_io.c
@@ -467,6 +467,7 @@ boolean_t net_deliver(boolean_t nonblocking)
 	    /* remember message sizes must be rounded up */
 	    kmsg->ikm_header.msgh_size =
 		    (((mach_msg_size_t) (sizeof(struct net_rcv_msg)
+					- sizeof net_kmsg(kmsg)->sent
 					- NET_RCV_MAX + count)) + 3) &~ 3;
 	    kmsg->ikm_header.msgh_local_port = MACH_PORT_NULL;
 	    kmsg->ikm_header.msgh_kind = MACH_MSGH_KIND_NORMAL;
-- 
cgit v1.2.3