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

Message ID 20180409083155.65E634127DE83@oldenburg.str.redhat.com
State New
Headers show
Series
  • [COMMITTED] resolv: Fully initialize struct mmsghdr in send_dg [BZ #23037]
Related show

Commit Message

Florian Weimer April 9, 2018, 8:31 a.m.
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.

Comments

Andreas Schwab April 9, 2018, 9:02 a.m. | #1
I think this has no real influence on the use in the resolver since the
socket it creates isn't a SOCK_SEQPACKET socket.  Do you agree?

Andreas.
Florian Weimer April 9, 2018, 9:07 a.m. | #2
On 04/09/2018 11:02 AM, Andreas Schwab wrote:
> I think this has no real influence on the use in the resolver since the
> socket it creates isn't a SOCK_SEQPACKET socket.  Do you agree?

It doesn't make a difference today, but the kernel folks might add 
processing for further flags in the future.  Some of the existing MSG_* 
flag look relevant to UDP.

Thanks,
Florian

Patch

diff --git a/resolv/res_send.c b/resolv/res_send.c
index 7debf143f7..9e9541789b 100644
--- a/resolv/res_send.c
+++ b/resolv/res_send.c
@@ -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))