From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 16 Oct 2024 05:35:32 +0000 (+0900)
Subject: test: fix TOCTOU in test-json
X-Git-Tag: v257-rc1~208
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7693e8d9d08a681fa7832565ca8da938f119bc7f;p=thirdparty%2Fsystemd.git

test: fix TOCTOU in test-json

Follow-up for 60ae3b86fb52d545b279e3927d2214462385e734.
Fixes CID#1563782.
---

diff --git a/src/test/test-json.c b/src/test/test-json.c
index c4df19e08dc..8dd5746495e 100644
--- a/src/test/test-json.c
+++ b/src/test/test-json.c
@@ -1372,8 +1372,8 @@ TEST(fd_info) {
         v = sd_json_variant_unref(v);
         fd = safe_close(fd);
 
-        if (access("/sys/class/net/lo/uevent", F_OK) >= 0) {
-                ASSERT_OK_ERRNO(fd = open("/sys/class/net/lo/uevent", O_CLOEXEC | O_PATH));
+        fd = open("/sys/class/net/lo/uevent", O_CLOEXEC | O_PATH);
+        if (fd >= 0) {
                 ASSERT_OK(json_variant_new_fd_info(&v, fd));
                 ASSERT_OK(sd_json_variant_dump(v, SD_JSON_FORMAT_PRETTY_AUTO | SD_JSON_FORMAT_COLOR_AUTO, NULL, NULL));
                 v = sd_json_variant_unref(v);
@@ -1381,8 +1381,8 @@ TEST(fd_info) {
         }
 
         /* block device */
-        if (access("/dev/sda", F_OK) >= 0) {
-                ASSERT_OK_ERRNO(fd = open("/dev/sda", O_CLOEXEC | O_PATH));
+        fd = open("/dev/sda", O_CLOEXEC | O_PATH);
+        if (fd >= 0) {
                 ASSERT_OK(json_variant_new_fd_info(&v, fd));
                 ASSERT_OK(sd_json_variant_dump(v, SD_JSON_FORMAT_PRETTY_AUTO | SD_JSON_FORMAT_COLOR_AUTO, NULL, NULL));
                 v = sd_json_variant_unref(v);