From: Vasiliy Stelmachenok <ventureo@yandex.ru>
Date: Fri, 8 Mar 2024 14:58:18 +0000 (+0300)
Subject: core/exec-invoke: Fix missing arguments for PR_SET_MEMORY_MERGE call
X-Git-Tag: v256-rc1~592
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9bb89a55a235a3c64ec099bb86296d7fd1bb3302;p=thirdparty%2Fsystemd.git

core/exec-invoke: Fix missing arguments for PR_SET_MEMORY_MERGE call

Without it prctl will always fail, even if using a kernel version that
supports the PR_SET_MEMORY_MERGE call.
---

diff --git a/src/core/exec-invoke.c b/src/core/exec-invoke.c
index b1298670c7e..91c7d412668 100644
--- a/src/core/exec-invoke.c
+++ b/src/core/exec-invoke.c
@@ -4733,7 +4733,7 @@ int exec_invoke(
         }
 
         if (context->memory_ksm >= 0)
-                if (prctl(PR_SET_MEMORY_MERGE, context->memory_ksm) < 0) {
+                if (prctl(PR_SET_MEMORY_MERGE, context->memory_ksm, 0, 0, 0) < 0) {
                         if (ERRNO_IS_NOT_SUPPORTED(errno))
                                 log_exec_debug_errno(context,
                                                      params,