|
 |
00db10 |
commit 583a27d525ae189bdfaa6784021b92a9a1dae12e
|
|
|
00db10 |
Author: Florian Weimer <fweimer@redhat.com>
|
|
|
00db10 |
Date: Mon Apr 9 10:08:07 2018 +0200
|
|
|
00db10 |
|
|
|
00db10 |
resolv: Fully initialize struct mmsghdr in send_dg [BZ #23037]
|
|
|
00db10 |
|
|
|
00db10 |
diff --git a/resolv/res_send.c b/resolv/res_send.c
|
|
|
00db10 |
index 478d542419566574..05c7ba511b0383c1 100644
|
|
|
00db10 |
--- a/resolv/res_send.c
|
|
|
00db10 |
+++ b/resolv/res_send.c
|
|
|
00db10 |
@@ -1154,25 +1154,27 @@ send_dg(res_state statp,
|
|
|
00db10 |
if (have_sendmmsg >= 0 && nwritten == 0 && buf2 != NULL
|
|
|
00db10 |
&& !single_request)
|
|
|
00db10 |
{
|
|
|
00db10 |
- struct iovec iov[2];
|
|
|
00db10 |
- struct mmsghdr reqs[2];
|
|
|
00db10 |
- reqs[0].msg_hdr.msg_name = NULL;
|
|
|
00db10 |
- reqs[0].msg_hdr.msg_namelen = 0;
|
|
|
00db10 |
- reqs[0].msg_hdr.msg_iov = &iov[0];
|
|
|
00db10 |
- reqs[0].msg_hdr.msg_iovlen = 1;
|
|
|
00db10 |
- iov[0].iov_base = (void *) buf;
|
|
|
00db10 |
- iov[0].iov_len = buflen;
|
|
|
00db10 |
- reqs[0].msg_hdr.msg_control = NULL;
|
|
|
00db10 |
- reqs[0].msg_hdr.msg_controllen = 0;
|
|
|
00db10 |
-
|
|
|
00db10 |
- reqs[1].msg_hdr.msg_name = NULL;
|
|
|
00db10 |
- reqs[1].msg_hdr.msg_namelen = 0;
|
|
|
00db10 |
- reqs[1].msg_hdr.msg_iov = &iov[1];
|
|
|
00db10 |
- reqs[1].msg_hdr.msg_iovlen = 1;
|
|
|
00db10 |
- iov[1].iov_base = (void *) buf2;
|
|
|
00db10 |
- iov[1].iov_len = buflen2;
|
|
|
00db10 |
- reqs[1].msg_hdr.msg_control = NULL;
|
|
|
00db10 |
- reqs[1].msg_hdr.msg_controllen = 0;
|
|
|
00db10 |
+ struct iovec iov =
|
|
|
00db10 |
+ { .iov_base = (void *) buf, .iov_len = buflen };
|
|
|
00db10 |
+ struct iovec iov2 =
|
|
|
00db10 |
+ { .iov_base = (void *) buf2, .iov_len = buflen2 };
|
|
|
00db10 |
+ struct mmsghdr reqs[2] =
|
|
|
00db10 |
+ {
|
|
|
00db10 |
+ {
|
|
|
00db10 |
+ .msg_hdr =
|
|
|
00db10 |
+ {
|
|
|
00db10 |
+ .msg_iov = &iov,
|
|
|
00db10 |
+ .msg_iovlen = 1,
|
|
|
00db10 |
+ },
|
|
|
00db10 |
+ },
|
|
|
00db10 |
+ {
|
|
|
00db10 |
+ .msg_hdr =
|
|
|
00db10 |
+ {
|
|
|
00db10 |
+ .msg_iov = &iov2,
|
|
|
00db10 |
+ .msg_iovlen = 1,
|
|
|
00db10 |
+ }
|
|
|
00db10 |
+ },
|
|
|
00db10 |
+ };
|
|
|
00db10 |
|
|
|
00db10 |
int ndg = __sendmmsg (pfd[0].fd, reqs, 2, MSG_NOSIGNAL);
|
|
|
00db10 |
if (__glibc_likely (ndg == 2))
|