You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
57 lines
1.7 KiB
57 lines
1.7 KiB
commit 583a27d525ae189bdfaa6784021b92a9a1dae12e |
|
Author: Florian Weimer <fweimer@redhat.com> |
|
Date: Mon Apr 9 10:08:07 2018 +0200 |
|
|
|
resolv: Fully initialize struct mmsghdr in send_dg [BZ #23037] |
|
|
|
diff --git a/resolv/res_send.c b/resolv/res_send.c |
|
index 478d542419566574..05c7ba511b0383c1 100644 |
|
--- a/resolv/res_send.c |
|
+++ b/resolv/res_send.c |
|
@@ -1154,25 +1154,27 @@ send_dg(res_state statp, |
|
if (have_sendmmsg >= 0 && nwritten == 0 && buf2 != NULL |
|
&& !single_request) |
|
{ |
|
- struct iovec iov[2]; |
|
- struct mmsghdr reqs[2]; |
|
- reqs[0].msg_hdr.msg_name = NULL; |
|
- reqs[0].msg_hdr.msg_namelen = 0; |
|
- reqs[0].msg_hdr.msg_iov = &iov[0]; |
|
- reqs[0].msg_hdr.msg_iovlen = 1; |
|
- iov[0].iov_base = (void *) buf; |
|
- iov[0].iov_len = buflen; |
|
- reqs[0].msg_hdr.msg_control = NULL; |
|
- reqs[0].msg_hdr.msg_controllen = 0; |
|
- |
|
- reqs[1].msg_hdr.msg_name = NULL; |
|
- reqs[1].msg_hdr.msg_namelen = 0; |
|
- reqs[1].msg_hdr.msg_iov = &iov[1]; |
|
- reqs[1].msg_hdr.msg_iovlen = 1; |
|
- iov[1].iov_base = (void *) buf2; |
|
- iov[1].iov_len = buflen2; |
|
- reqs[1].msg_hdr.msg_control = NULL; |
|
- reqs[1].msg_hdr.msg_controllen = 0; |
|
+ struct iovec iov = |
|
+ { .iov_base = (void *) buf, .iov_len = buflen }; |
|
+ struct iovec iov2 = |
|
+ { .iov_base = (void *) buf2, .iov_len = buflen2 }; |
|
+ struct mmsghdr reqs[2] = |
|
+ { |
|
+ { |
|
+ .msg_hdr = |
|
+ { |
|
+ .msg_iov = &iov, |
|
+ .msg_iovlen = 1, |
|
+ }, |
|
+ }, |
|
+ { |
|
+ .msg_hdr = |
|
+ { |
|
+ .msg_iov = &iov2, |
|
+ .msg_iovlen = 1, |
|
+ } |
|
+ }, |
|
+ }; |
|
|
|
int ndg = __sendmmsg (pfd[0].fd, reqs, 2, MSG_NOSIGNAL); |
|
if (__glibc_likely (ndg == 2))
|
|
|