persist_timestamp: create timestamp file with O_NOFOLLOW and don't leak the name

diff --git a/persist_timestamp.c b/persist_timestamp.c
index c30b8f350947dffe1eaa3ab92dc22a257dac8e3f..81ea273ce4f0fe4d54c4705eb54845083972ea51 100644 (file)
--- a/persist_timestamp.c
+++ b/persist_timestamp.c
@@ -262,11 +262,12 @@ persist_open(int *valid, int secs)
 
        if ((fd = openat(dirfd, name, (O_RDWR), (S_IRUSR|S_IWUSR))) == -1)
                if (errno != ENOENT)
-                       err(1, "open: %s", name);
+                       err(1, "open timestamp file");
 
        if (fd == -1) {
-               if ((fd = openat(dirfd, name, (O_RDWR|O_CREAT|O_EXCL), (S_IRUSR|S_IWUSR))) == -1)
-                       err(1, "open: %s", name);
+               if ((fd = openat(dirfd, name, (O_RDWR|O_CREAT|O_EXCL|O_NOFOLLOW),
+                   (S_IRUSR|S_IWUSR))) == -1)
+                       err(1, "open timestamp file");
        }
 
        size_t tssize;