From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sat, 8 Apr 2023 09:00:31 +0000 (+0900)
Subject: os-util: make open_extension_release() return O_PATH fd
X-Git-Tag: v254-rc1~760^2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=396ec9587ce075cac06ab653cda5f4850e2855cd;p=thirdparty%2Fsystemd.git

os-util: make open_extension_release() return O_PATH fd
---

diff --git a/src/basic/os-util.c b/src/basic/os-util.c
index 0bc1aeb25cc..c1874e2572e 100644
--- a/src/basic/os-util.c
+++ b/src/basic/os-util.c
@@ -230,18 +230,8 @@ int open_extension_release(const char *root, ImageClass image_class, const char
         if (r < 0)
                 return r;
 
-        if (ret_fd) {
-                int real_fd;
-
-                /* Convert the O_PATH fd into a proper, readable one */
-                real_fd = fd_reopen(fd, O_RDONLY|O_CLOEXEC|O_NOCTTY);
-                safe_close(fd);
-                if (real_fd < 0)
-                        return real_fd;
-
-                *ret_fd = real_fd;
-        }
-
+        if (ret_fd)
+                *ret_fd = TAKE_FD(fd);
         if (ret_path)
                 *ret_path = TAKE_PTR(q);