From 4bb81e89406077b8402630f240d244ce446dfa54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= <daniel@ekloef.se>
Date: Tue, 29 Mar 2022 18:21:13 +0200
Subject: [PATCH] modules: add SOCK_CLOEXEC to all socket() calls

---
 modules/i3.c       | 2 +-
 modules/mpd.c      | 2 +-
 modules/network.c  | 4 ++--
 modules/sway-xkb.c | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/i3.c b/modules/i3.c
index a7f3cc0..22b6d4b 100644
--- a/modules/i3.c
+++ b/modules/i3.c
@@ -621,7 +621,7 @@ run(struct module *mod)
     if (!i3_get_socket_address(&addr))
         return 1;
 
-    int sock = socket(AF_UNIX, SOCK_STREAM, 0);
+    int sock = socket(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0);
     if (sock == -1) {
         LOG_ERRNO("failed to create UNIX socket");
         return 1;
diff --git a/modules/mpd.c b/modules/mpd.c
index b2e9e6e..27992d3 100644
--- a/modules/mpd.c
+++ b/modules/mpd.c
@@ -223,7 +223,7 @@ wait_for_socket_create(const struct module *mod)
     struct stat st;
     if (stat(m->host, &st) == 0 && S_ISSOCK(st.st_mode)) {
 
-        int s = socket(AF_UNIX, SOCK_STREAM, 0);
+        int s = socket(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0);
 
         struct sockaddr_un addr = {.sun_family = AF_UNIX};
         strncpy(addr.sun_path, m->host, sizeof(addr.sun_path) - 1);
diff --git a/modules/network.c b/modules/network.c
index 3bff716..34980fa 100644
--- a/modules/network.c
+++ b/modules/network.c
@@ -167,7 +167,7 @@ nl_pid_value(void)
 static int
 netlink_connect_rt(void)
 {
-    int sock = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
+    int sock = socket(AF_NETLINK, SOCK_RAW | SOCK_CLOEXEC, NETLINK_ROUTE);
     if (sock == -1) {
         LOG_ERRNO("failed to create netlink socket");
         return -1;
@@ -191,7 +191,7 @@ netlink_connect_rt(void)
 static int
 netlink_connect_genl(void)
 {
-    int sock = socket(AF_NETLINK, SOCK_RAW, NETLINK_GENERIC);
+    int sock = socket(AF_NETLINK, SOCK_RAW | SOCK_CLOEXEC, NETLINK_GENERIC);
     if (sock == -1) {
         LOG_ERRNO("failed to create netlink socket");
         return -1;
diff --git a/modules/sway-xkb.c b/modules/sway-xkb.c
index 9841feb..6632ab7 100644
--- a/modules/sway-xkb.c
+++ b/modules/sway-xkb.c
@@ -267,7 +267,7 @@ run(struct module *mod)
     if (!i3_get_socket_address(&addr))
         return 1;
 
-    int sock = socket(AF_UNIX, SOCK_STREAM, 0);
+    int sock = socket(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0);
     if (sock == -1) {
         LOG_ERRNO("failed to create UNIX socket");
         return 1;