From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Fri, 28 Jun 2019 09:25:32 +0000 (+0200)
Subject: Clear CMSG_SPACE(sizeof(data)) in cmsghdr to appease valgrind.
X-Git-Tag: rec-4.2.0~4^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cf917824910b09ea8a3860acf100189de4f0ef35;p=thirdparty%2Fpdns.git

Clear CMSG_SPACE(sizeof(data)) in cmsghdr to appease valgrind.

(cherry picked from commit 20b22895546a3e7fb7760940599dfb1e29a00777)
---

diff --git a/pdns/misc.cc b/pdns/misc.cc
index 1f90bbcbd1..a051b7e20c 100644
--- a/pdns/misc.cc
+++ b/pdns/misc.cc
@@ -900,7 +900,8 @@ void addCMsgSrcAddr(struct msghdr* msgh, void* cmsgbuf, const ComboAddress* sour
     cmsg->cmsg_len = CMSG_LEN(sizeof(*pkt));
 
     pkt = (struct in6_pktinfo *) CMSG_DATA(cmsg);
-    memset(pkt, 0, sizeof(*pkt));
+    // Include the padding to stop valgrind complaining about passing uninitialized data
+    memset(pkt, 0, CMSG_SPACE(sizeof(*pkt)));
     pkt->ipi6_addr = source->sin6.sin6_addr;
     pkt->ipi6_ifindex = itfIndex;
   }
@@ -917,7 +918,8 @@ void addCMsgSrcAddr(struct msghdr* msgh, void* cmsgbuf, const ComboAddress* sour
     cmsg->cmsg_len = CMSG_LEN(sizeof(*pkt));
 
     pkt = (struct in_pktinfo *) CMSG_DATA(cmsg);
-    memset(pkt, 0, sizeof(*pkt));
+    // Include the padding to stop valgrind complaining about passing uninitialized data
+    memset(pkt, 0, CMSG_SPACE(sizeof(*pkt)));
     pkt->ipi_spec_dst = source->sin4.sin_addr;
     pkt->ipi_ifindex = itfIndex;
 #elif defined(IP_SENDSRCADDR)
@@ -931,7 +933,9 @@ void addCMsgSrcAddr(struct msghdr* msgh, void* cmsgbuf, const ComboAddress* sour
     cmsg->cmsg_type = IP_SENDSRCADDR;
     cmsg->cmsg_len = CMSG_LEN(sizeof(*in));
 
+    // Include the padding to stop valgrind complaining about passing uninitialized data
     in = (struct in_addr *) CMSG_DATA(cmsg);
+    memset(in, 0, CMSG_SPACE(sizeof(*in)));
     *in = source->sin4.sin_addr;
 #endif
   }