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