AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-22 19:00:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolv: Fully initialize struct mmsghdr in send_dg [BZ #23037]

Browse Source
This commit is contained in:
Florian Weimer 2018-04-09 10:08:07 +02:00
parent 942de61a89
commit 583a27d525
2 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2018-04-09 Florian Weimer <fweimer@redhat.com>
[BZ #23037]
* resolv/res_send.c (send_dg): Use designated initializers instead
of assignment to zero-initialize other fields of struct mmsghdr.
2018-04-06 Adhemerval Zanella <adhemerval.zanella@linaro.org>
* sysdeps/posix/readdir.c (__READDIR, __GETDENTS, DIRENTY_TYPE,

40
resolv/res_send.c
View File

@ -1157,25 +1157,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))