From: Mike Yuan <me@yhndnzj.com>
Date: Sat, 7 Sep 2024 00:32:01 +0000 (+0200)
Subject: chattr-util: set O_NOCTTY when reopening O_PATH fd
X-Git-Tag: v257-rc1~512^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26f58977670920a6abcddbffa5d042aad40d59f3;p=thirdparty%2Fsystemd.git

chattr-util: set O_NOCTTY when reopening O_PATH fd

Follow-up for 07862c9fc2becdc4bbe112b023591d2ab2dd032b
---

diff --git a/src/basic/chattr-util.c b/src/basic/chattr-util.c
index 13d46f26aaa..02d2cc2e526 100644
--- a/src/basic/chattr-util.c
+++ b/src/basic/chattr-util.c
@@ -138,6 +138,7 @@ int read_attr_fd(int fd, unsigned *ret) {
         struct stat st;
 
         assert(fd >= 0);
+        assert(ret);
 
         if (fstat(fd, &st) < 0)
                 return -errno;
@@ -156,7 +157,7 @@ int read_attr_at(int dir_fd, const char *path, unsigned *ret) {
         assert(ret);
 
         if (isempty(path)) {
-                fd = fd_reopen_condition(dir_fd, O_RDONLY|O_CLOEXEC, O_PATH, &fd_close); /* drop O_PATH if it is set */
+                fd = fd_reopen_condition(dir_fd, O_RDONLY|O_CLOEXEC|O_NOCTTY, O_PATH, &fd_close); /* drop O_PATH if it is set */
                 if (fd < 0)
                         return fd;
         } else {