From: Christian Franke <chris@opensourcerouting.org>
Date: Fri, 8 Mar 2013 01:35:38 +0000 (+0100)
Subject: ospf6d: set cmsg size correctly
X-Git-Tag: frr-2.0-rc1~1628^2~5
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=1579a67f130ca34df9acefac14ebcdfdd8f6600a;p=mirror_frr.git

ospf6d: set cmsg size correctly

On both Linux and FreeBSD, msg_controllen should be set to
CMSG_LEN, not CMSG_SPACE. This avoids sending 4 bytes of
trailing garbage to the kernel.

Signed-off-by: Christian Franke <chris@opensourcerouting.org>
---

diff --git a/ospf6d/ospf6_network.c b/ospf6d/ospf6_network.c
index eed7f9d66..74cfbec7c 100644
--- a/ospf6d/ospf6_network.c
+++ b/ospf6d/ospf6_network.c
@@ -206,7 +206,7 @@ ospf6_sendmsg (struct in6_addr *src, struct in6_addr *dst,
   smsghdr.msg_name = (caddr_t) &dst_sin6;
   smsghdr.msg_namelen = sizeof (struct sockaddr_in6);
   smsghdr.msg_control = (caddr_t) cmsgbuf;
-  smsghdr.msg_controllen = sizeof (cmsgbuf);
+  smsghdr.msg_controllen = scmsgp->cmsg_len;
 
   retval = sendmsg (ospf6_sock, &smsghdr, 0);
   if (retval != iov_totallen (message))