mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-03 08:05:21 +00:00
Code Issues Releases Wiki Activity

memset the remainder of sendcmsgbuf to 0 in a attempt to silence valgrind; msg->msg_control was not being set when it should have been; be consistent when setting msg->msg_control

Browse Source
This commit is contained in:
Mark Andrews
2018-01-11 16:19:00 +11:00
parent 4b48e307e0
commit 2fca8cbdff
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/isc/unix/socket.c
View File

@@ -1525,9 +1525,9 @@ build_msghdr_send(isc__socket_t *sock, isc_socketevent_t *dev,
"sendto pktinfo data, ifindex %u", "sendto pktinfo data, ifindex %u",
dev->pktinfo.ipi6_ifindex); dev->pktinfo.ipi6_ifindex);
msg->msg_control = (void *)sock->sendcmsgbuf;
msg->msg_controllen = cmsg_space(sizeof(struct in6_pktinfo)); msg->msg_controllen = cmsg_space(sizeof(struct in6_pktinfo));
INSIST(msg->msg_controllen <= sock->sendcmsgbuflen); INSIST(msg->msg_controllen <= sock->sendcmsgbuflen);
msg->msg_control = (void *)sock->sendcmsgbuf;
cmsgp = (struct cmsghdr *)sock->sendcmsgbuf; cmsgp = (struct cmsghdr *)sock->sendcmsgbuf;
cmsgp->cmsg_level = IPPROTO_IPV6; cmsgp->cmsg_level = IPPROTO_IPV6;
@@ -1546,6 +1546,7 @@ build_msghdr_send(isc__socket_t *sock, isc_socketevent_t *dev,
cmsgp = (struct cmsghdr *)(sock->sendcmsgbuf + cmsgp = (struct cmsghdr *)(sock->sendcmsgbuf +
msg->msg_controllen); msg->msg_controllen);
msg->msg_control = (void *)sock->sendcmsgbuf;
msg->msg_controllen += cmsg_space(sizeof(use_min_mtu)); msg->msg_controllen += cmsg_space(sizeof(use_min_mtu));
INSIST(msg->msg_controllen <= sock->sendcmsgbuflen); INSIST(msg->msg_controllen <= sock->sendcmsgbuflen);
@@ -1631,6 +1632,12 @@ build_msghdr_send(isc__socket_t *sock, isc_socketevent_t *dev,
sock->dscp = dscp; sock->dscp = dscp;
} }
#endif #endif
if (msg->msg_controllen != 0 &&
msg->msg_controllen < sock->sendcmsgbuflen)
{
memset(sock->sendcmsgbuf + msg->msg_controllen, 0,
sock->sendcmsgbuflen - msg->msg_controllen);
}
} }
#endif /* USE_CMSG */ #endif /* USE_CMSG */
#else /* ISC_NET_BSD44MSGHDR */ #else /* ISC_NET_BSD44MSGHDR */