From 9e37cb1855c8fc1667f7e404376070952c015788 Mon Sep 17 00:00:00 2001

From: Yu Watanabe <watanabe.yu+github@gmail.com>

Date: Tue, 22 Feb 2022 21:38:15 +0900

Subject: [PATCH] test: fix file descriptor leak in test-oomd-util

Fixes an issue reported in #22576.

(cherry picked from commit 282696ce52471f5e3c963b9d98dbc89fba3a1fba)

Related: #2087652

---

 src/oom/test-oomd-util.c | 5 ++++-

 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/oom/test-oomd-util.c b/src/oom/test-oomd-util.c

index 265e77c0a2..0252ceecd7 100644

--- a/src/oom/test-oomd-util.c

+++ b/src/oom/test-oomd-util.c

@@ -5,6 +5,7 @@

 #include "alloc-util.h"

 #include "cgroup-setup.h"

 #include "cgroup-util.h"

+#include "fd-util.h"

 #include "fileio.h"

 #include "fs-util.h"

 #include "oomd-util.h"

@@ -13,6 +14,7 @@

 #include "string-util.h"

 #include "strv.h"

 #include "tests.h"

+#include "tmpfile-util.h"

 static int fork_and_sleep(unsigned sleep_min) {

         usec_t n, timeout, ts;

@@ -244,12 +246,13 @@ static void test_oomd_update_cgroup_contexts_between_hashmaps(void) {

 static void test_oomd_system_context_acquire(void) {

         _cleanup_(unlink_tempfilep) char path[] = "/oomdgetsysctxtestXXXXXX";

+        _cleanup_close_ int fd = -1;

         OomdSystemContext ctx;

         if (geteuid() != 0)

                 return (void) log_tests_skipped("not root");

-        assert_se(mkstemp(path));

+        assert_se((fd = mkostemp_safe(path)) >= 0);

         assert_se(oomd_system_context_acquire("/verylikelynonexistentpath", &ctx) == -ENOENT);