1From 5b70e5f6af8d0688b8947c649acc2904cce96d3b Mon Sep 17 00:00:00 2001
 2From: Michael Forney <mforney@mforney.org>
 3Date: Tue, 4 Jul 2023 10:44:15 -0700
 4Subject: [PATCH] utils: Avoid unnecessary VLAs
 5
 6---
 7 utils.c | 10 ++++------
 8 1 file changed, 4 insertions(+), 6 deletions(-)
 9
10diff --git a/utils.c b/utils.c
11index 51875ae..8ab89bb 100644
12--- a/utils.c
13+++ b/utils.c
14@@ -758,15 +758,14 @@ send_pid_on_socket (int sockfd)
15   char buf[1] = { 0 };
16   struct msghdr msg = {};
17   struct iovec iov = { buf, sizeof (buf) };
18-  const ssize_t control_len_snd = CMSG_SPACE(sizeof(struct ucred));
19-  _Alignas(struct cmsghdr) char control_buf_snd[control_len_snd];
20+  _Alignas(struct cmsghdr) char control_buf_snd[CMSG_SPACE(sizeof(struct ucred))];
21   struct cmsghdr *cmsg;
22   struct ucred cred;
23 
24   msg.msg_iov = &iov;
25   msg.msg_iovlen = 1;
26   msg.msg_control = control_buf_snd;
27-  msg.msg_controllen = control_len_snd;
28+  msg.msg_controllen = sizeof (control_buf_snd);
29 
30   cmsg = CMSG_FIRSTHDR(&msg);
31   cmsg->cmsg_level = SOL_SOCKET;
32@@ -800,14 +799,13 @@ read_pid_from_socket (int sockfd)
33   char recv_buf[1] = { 0 };
34   struct msghdr msg = {};
35   struct iovec iov = { recv_buf, sizeof (recv_buf) };
36-  const ssize_t control_len_rcv = CMSG_SPACE(sizeof(struct ucred));
37-  _Alignas(struct cmsghdr) char control_buf_rcv[control_len_rcv];
38+  _Alignas(struct cmsghdr) char control_buf_rcv[CMSG_SPACE(sizeof(struct ucred))];
39   struct cmsghdr* cmsg;
40 
41   msg.msg_iov = &iov;
42   msg.msg_iovlen = 1;
43   msg.msg_control = control_buf_rcv;
44-  msg.msg_controllen = control_len_rcv;
45+  msg.msg_controllen = sizeof (control_buf_rcv);
46 
47   if (TEMP_FAILURE_RETRY (recvmsg (sockfd, &msg, 0)) < 0)
48     die_with_error ("Can't read pid from socket");
49-- 
502.44.0
51