core: make sure to close connection fd when we fail to activate a per-connection...

Fixes: #2993 #2691

diff --git a/src/core/service.c b/src/core/service.c
index 3c4328c584e075d69d4b1e711ecf445b7ad31791..88f8cc5795eecfb82cdc8135422b09a4d32a33d7 100644 (file)
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -180,7 +180,7 @@ static int service_set_main_pid(Service *s, pid_t pid) {
         return 0;
 }
 
-static void service_close_socket_fd(Service *s) {
+void service_close_socket_fd(Service *s) {
         assert(s);
 
         s->socket_fd = asynchronous_close(s->socket_fd);

diff --git a/src/core/service.h b/src/core/service.h
index cd9e41646e4b86e373a06abff4d478ed921b7c0d..c7f1e81bdb743e7c61c37d1e4215a8fc8446e32a 100644 (file)
--- a/src/core/service.h
+++ b/src/core/service.h
@@ -198,6 +198,7 @@ struct Service {
 extern const UnitVTable service_vtable;
 
 int service_set_socket_fd(Service *s, int fd, struct Socket *socket, bool selinux_context_net);
+void service_close_socket_fd(Service *s);
 
 const char* service_restart_to_string(ServiceRestart i) _const_;
 ServiceRestart service_restart_from_string(const char *s) _pure_;

diff --git a/src/core/socket.c b/src/core/socket.c
index 42260d872921a9d333dca31d335a7d7ff9572268..a897a11a291271f53f4d91450ceacbce5dbcfbff 100644 (file)
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -2010,8 +2010,12 @@ static void socket_enter_running(Socket *s, int cfd) {
                 s->n_connections++;
 
                 r = manager_add_job(UNIT(s)->manager, JOB_START, UNIT(service), JOB_REPLACE, &error, NULL);
-                if (r < 0)
+                if (r < 0) {
+                        /* We failed to activate the new service, but it still exists. Let's make sure the service
+                         * closes and forgets the connection fd again, immediately. */
+                        service_close_socket_fd(service);
                         goto fail;
+                }
 
                 /* Notify clients about changed counters */
                 unit_add_to_dbus_queue(UNIT(s));