tree-wide: Always use recvmsg with MSG_CMSG_CLOEXEC

diff --git a/src/libsystemd-network/sd-dhcp-client.c b/src/libsystemd-network/sd-dhcp-client.c
index 5f90617b9e3b2833e8515392ff25c63ea2b1b757..2f76e24ce33b7bd649e60b032363b6e75ed738e1 100644 (file)
--- a/src/libsystemd-network/sd-dhcp-client.c
+++ b/src/libsystemd-network/sd-dhcp-client.c
@@ -1582,7 +1582,7 @@ static int client_receive_message_raw(sd_event_source *s, int fd,
         iov.iov_base = packet;
         iov.iov_len = buflen;
 
-        len = recvmsg(fd, &msg, 0);
+        len = recvmsg(fd, &msg, MSG_CMSG_CLOEXEC);
         if (len < 0) {
                 log_dhcp_client(client, "could not receive message from raw "
                                 "socket: %m");

diff --git a/src/libsystemd-network/sd-dhcp-server.c b/src/libsystemd-network/sd-dhcp-server.c
index 3f89f344d74905c2ebe87a8f10697f01b1515ed5..1cb782fca3cf3239951f593f17b5cdd7bde8e8e8 100644 (file)
--- a/src/libsystemd-network/sd-dhcp-server.c
+++ b/src/libsystemd-network/sd-dhcp-server.c
@@ -897,7 +897,7 @@ static int server_receive_message(sd_event_source *s, int fd,
         iov.iov_base = message;
         iov.iov_len = buflen;
 
-        len = recvmsg(fd, &msg, 0);
+        len = recvmsg(fd, &msg, MSG_CMSG_CLOEXEC);
         if (len < buflen)
                 return 0;
         else if ((size_t)len < sizeof(DHCPMessage))

diff --git a/src/libsystemd/sd-rtnl/rtnl-message.c b/src/libsystemd/sd-rtnl/rtnl-message.c
index 276591f31b9e2d029985e6912a37b1445f3fcd6e..e7e3799286124af22b2838002dbd98af486aec86 100644 (file)
--- a/src/libsystemd/sd-rtnl/rtnl-message.c
+++ b/src/libsystemd/sd-rtnl/rtnl-message.c
@@ -1431,7 +1431,7 @@ static int socket_recv_message(int fd, struct iovec *iov, uint32_t *_group, bool
         assert(fd >= 0);
         assert(iov);
 
-        r = recvmsg(fd, &msg, MSG_TRUNC | (peek ? MSG_PEEK : 0));
+        r = recvmsg(fd, &msg, MSG_TRUNC | MSG_CMSG_CLOEXEC | (peek ? MSG_PEEK : 0));
         if (r < 0) {
                 /* no data */
                 if (errno == ENOBUFS)
@@ -1467,7 +1467,7 @@ static int socket_recv_message(int fd, struct iovec *iov, uint32_t *_group, bool
                 /* not from the kernel, ignore */
                 if (peek) {
                         /* drop the message */
-                        r = recvmsg(fd, &msg, 0);
+                        r = recvmsg(fd, &msg, MSG_CMSG_CLOEXEC);
                         if (r < 0)
                                 return (errno == EAGAIN || errno == EINTR) ? 0 : -errno;
                 }

diff --git a/src/libudev/libudev-monitor.c b/src/libudev/libudev-monitor.c
index 08ddde8fd77f19ab460709b098a69635f9f156f8..82ce7f67e3217a31a17d9604ab1742bd33906c2a 100644 (file)
--- a/src/libudev/libudev-monitor.c
+++ b/src/libudev/libudev-monitor.c
@@ -600,7 +600,7 @@ retry:
         smsg.msg_name = &snl;
         smsg.msg_namelen = sizeof(snl);
 
-        buflen = recvmsg(udev_monitor->sock, &smsg, 0);
+        buflen = recvmsg(udev_monitor->sock, &smsg, MSG_CMSG_CLOEXEC);
         if (buflen < 0) {
                 if (errno != EINTR)
                         log_debug("unable to receive message");

diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c
index b46f0a8dac8afc811fc7b6c1b5e0e0dd5ac9c75c..da8e6c08e70a0e72e5c3b89c3e457d931f3c0564 100644 (file)
--- a/src/machine/machine-dbus.c
+++ b/src/machine/machine-dbus.c
@@ -255,7 +255,7 @@ int bus_machine_method_get_addresses(sd_bus *bus, sd_bus_message *message, void
                 iov[0] = (struct iovec) { .iov_base = &family, .iov_len = sizeof(family) };
                 iov[1] = (struct iovec) { .iov_base = &in_addr, .iov_len = sizeof(in_addr) };
 
-                n = recvmsg(pair[0], &mh, 0);
+                n = recvmsg(pair[0], &mh, MSG_CMSG_CLOEXEC);
                 if (n < 0)
                         return sd_bus_error_set_errno(error, -errno);
                 if ((size_t) n < sizeof(family))

diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c
index 890cc0494168434c3055414b02bc43abe5f28058..d5c1bf0fbda2c6dc695a890b6d3dc5c8cf1e3863 100644 (file)
--- a/src/resolve/resolved-manager.c
+++ b/src/resolve/resolved-manager.c
@@ -892,7 +892,7 @@ int manager_recv(Manager *m, int fd, DnsProtocol protocol, DnsPacket **ret) {
         mh.msg_control = &control;
         mh.msg_controllen = sizeof(control);
 
-        l = recvmsg(fd, &mh, 0);
+        l = recvmsg(fd, &mh, MSG_CMSG_CLOEXEC);
         if (l < 0) {
                 if (errno == EAGAIN || errno == EINTR)
                         return 0;

diff --git a/src/shutdownd/shutdownd.c b/src/shutdownd/shutdownd.c
index 826efbfeabb12a139508fa35d5c5dd47829e579a..6eb522bcfceed559d67f7d5da297044aaa6cf5ab 100644 (file)
--- a/src/shutdownd/shutdownd.c
+++ b/src/shutdownd/shutdownd.c
@@ -69,7 +69,7 @@ static int read_packet(int fd, union shutdown_buffer *_b) {
         assert(fd >= 0);
         assert(_b);
 
-        n = recvmsg(fd, &msghdr, MSG_DONTWAIT);
+        n = recvmsg(fd, &msghdr, MSG_DONTWAIT|MSG_CMSG_CLOEXEC);
         if (n <= 0) {
                 if (n == 0) {
                         log_error("Short read");

diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c
index 223671c08725049b1c8634c4cf029a661a0d8a85..edddc2f05e980800babf9aec95b604240b956a69 100644 (file)
--- a/src/timesync/timesyncd-manager.c
+++ b/src/timesync/timesyncd-manager.c
@@ -516,7 +516,7 @@ static int manager_receive_response(sd_event_source *source, int fd, uint32_t re
                 return manager_connect(m);
         }
 
-        len = recvmsg(fd, &msghdr, MSG_DONTWAIT);
+        len = recvmsg(fd, &msghdr, MSG_DONTWAIT|MSG_CMSG_CLOEXEC);
         if (len < 0) {
                 if (errno == EAGAIN)
                         return 0;

diff --git a/src/udev/udev-ctrl.c b/src/udev/udev-ctrl.c
index 538b34286561065bdf6a55d7e0676b74e67fa68e..47f06510c8ee9c8500a9e7f96f65bcdbcaebef69 100644 (file)
--- a/src/udev/udev-ctrl.c
+++ b/src/udev/udev-ctrl.c
@@ -372,7 +372,7 @@ struct udev_ctrl_msg *udev_ctrl_receive_msg(struct udev_ctrl_connection *conn) {
         iov.iov_base = &uctrl_msg->ctrl_msg_wire;
         iov.iov_len = sizeof(struct udev_ctrl_msg_wire);
 
-        size = recvmsg(conn->sock, &smsg, 0);
+        size = recvmsg(conn->sock, &smsg, MSG_CMSG_CLOEXEC);
         if (size <  0) {
                 log_error_errno(errno, "unable to receive ctrl message: %m");
                 goto err;