From: Mike Yuan <me@yhndnzj.com>
Date: Fri, 31 Oct 2025 15:09:54 +0000 (+0100)
Subject: core/exec-invoke: correct fd array size for collect_open_file_fds()
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f8574e252a1edb33cd4086cafae52bcb5d62b830;p=thirdparty%2Fsystemd.git

core/exec-invoke: correct fd array size for collect_open_file_fds()

Follow-up for f70346fb87052f37d446d2e9ccf915e5289b2b87
---

diff --git a/src/core/exec-invoke.c b/src/core/exec-invoke.c
index 14e15cb8a66..cfa6df3d71e 100644
--- a/src/core/exec-invoke.c
+++ b/src/core/exec-invoke.c
@@ -4444,13 +4444,13 @@ static int collect_open_file_fds(ExecParameters *p) {
                         return log_error_errno(fd, "Failed to get OpenFile= file descriptor for '%s': %m", of->path);
                 }
 
-                if (!GREEDY_REALLOC(p->fds, p->n_stashed_fds + 1))
+                if (!GREEDY_REALLOC(p->fds, p->n_socket_fds + p->n_stashed_fds + 1))
                         return log_oom();
 
                 if (strv_extend(&p->fd_names, of->fdname) < 0)
                         return log_oom();
 
-                p->fds[p->n_stashed_fds++] = TAKE_FD(fd);
+                p->fds[p->n_socket_fds + p->n_stashed_fds++] = TAKE_FD(fd);
         }
 
         return 0;