journald: fix memory leak on error path

[elogind.git] / src / journal / journal-vacuum.c

diff --git a/src/journal/journal-vacuum.c b/src/journal/journal-vacuum.c
index c73ad8f3938f8ce015322b85b8b589c126ff03f8..80723c47f06c5c7635cf3a55515f68dd32dab4b9 100644 (file)
--- a/src/journal/journal-vacuum.c
+++ b/src/journal/journal-vacuum.c
@@ -24,10 +24,7 @@
 #include <sys/stat.h>
 #include <sys/statvfs.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <sys/statvfs.h>
 #include <unistd.h>

-
-#ifdef HAVE_XATTR
-#include <attr/xattr.h>
-#endif
+#include <sys/xattr.h>

 
 #include "journal-def.h"
 #include "journal-file.h"
 
 #include "journal-def.h"
 #include "journal-file.h"


@@ -79,11 +76,8 @@ static void patch_realtime(
                 unsigned long long *realtime) {
 
         usec_t x;
                 unsigned long long *realtime) {
 
         usec_t x;

-
-#ifdef HAVE_XATTR

         uint64_t crtime;
         _cleanup_free_ const char *path = NULL;
         uint64_t crtime;
         _cleanup_free_ const char *path = NULL;

-#endif

 
         /* The timestamp was determined by the file name, but let's
          * see if the file might actually be older than the file name
 
         /* The timestamp was determined by the file name, but let's
          * see if the file might actually be older than the file name


@@ -95,18 +89,17 @@ static void patch_realtime(
         assert(realtime);
 
         x = timespec_load(&st->st_ctim);
         assert(realtime);
 
         x = timespec_load(&st->st_ctim);

-        if (x > 0 && x != (usec_t) -1 && x < *realtime)
+        if (x > 0 && x != USEC_INFINITY && x < *realtime)

                 *realtime = x;
 
         x = timespec_load(&st->st_atim);
                 *realtime = x;
 
         x = timespec_load(&st->st_atim);

-        if (x > 0 && x != (usec_t) -1 && x < *realtime)
+        if (x > 0 && x != USEC_INFINITY && x < *realtime)

                 *realtime = x;
 
         x = timespec_load(&st->st_mtim);
                 *realtime = x;
 
         x = timespec_load(&st->st_mtim);

-        if (x > 0 && x != (usec_t) -1 && x < *realtime)
+        if (x > 0 && x != USEC_INFINITY && x < *realtime)

                 *realtime = x;
 
                 *realtime = x;
 

-#ifdef HAVE_XATTR

         /* Let's read the original creation time, if possible. Ideally
          * we'd just query the creation time the FS might provide, but
          * unfortunately there's currently no sane API to query
         /* Let's read the original creation time, if possible. Ideally
          * we'd just query the creation time the FS might provide, but
          * unfortunately there's currently no sane API to query


@@ -125,34 +118,41 @@ static void patch_realtime(
                 if (crtime > 0 && crtime != (uint64_t) -1 && crtime < *realtime)
                         *realtime = crtime;
         }
                 if (crtime > 0 && crtime != (uint64_t) -1 && crtime < *realtime)
                         *realtime = crtime;
         }

-#endif

 }
 
 static int journal_file_empty(int dir_fd, const char *name) {
 }
 
 static int journal_file_empty(int dir_fd, const char *name) {

-        int r;
-        le64_t n_entries;

         _cleanup_close_ int fd;
         _cleanup_close_ int fd;

+        struct stat st;
+        le64_t n_entries;
+        ssize_t n;

 
         fd = openat(dir_fd, name, O_RDONLY|O_CLOEXEC|O_NOFOLLOW|O_NONBLOCK);
         if (fd < 0)
                 return -errno;
 
 
         fd = openat(dir_fd, name, O_RDONLY|O_CLOEXEC|O_NOFOLLOW|O_NONBLOCK);
         if (fd < 0)
                 return -errno;
 

-        if (lseek(fd, offsetof(Header, n_entries), SEEK_SET) < 0)
+        if (fstat(fd, &st) < 0)

                 return -errno;
 
                 return -errno;
 

-        r = read(fd, &n_entries, sizeof(n_entries));
-        if (r != sizeof(n_entries))
-                return r == 0 ? -EINVAL : -errno;
+        /* If an offline file doesn't even have a header we consider it empty */
+        if (st.st_size < (off_t) sizeof(Header))
+                return 1;
+
+        /* If the number of entries is empty, we consider it empty, too */
+        n = pread(fd, &n_entries, sizeof(n_entries), offsetof(Header, n_entries));
+        if (n < 0)
+                return -errno;
+        if (n != sizeof(n_entries))
+                return -EIO;

 
 

-        return le64toh(n_entries) == 0;
+        return le64toh(n_entries) <= 0;

 }
 
 int journal_directory_vacuum(
                 const char *directory,
                 uint64_t max_use,
 }
 
 int journal_directory_vacuum(
                 const char *directory,
                 uint64_t max_use,

-                uint64_t min_free,

                 usec_t max_retention_usec,
                 usec_t max_retention_usec,

-                usec_t *oldest_usec) {
+                usec_t *oldest_usec,
+                bool verbose) {

 
         _cleanup_closedir_ DIR *d = NULL;
         int r = 0;
 
         _cleanup_closedir_ DIR *d = NULL;
         int r = 0;


@@ -161,10 +161,11 @@ int journal_directory_vacuum(
         size_t n_allocated = 0;
         uint64_t sum = 0, freed = 0;
         usec_t retention_limit = 0;
         size_t n_allocated = 0;
         uint64_t sum = 0, freed = 0;
         usec_t retention_limit = 0;

+        char sbytes[FORMAT_BYTES_MAX];

 
         assert(directory);
 
 
         assert(directory);
 

-        if (max_use <= 0 && min_free <= 0 && max_retention_usec <= 0)
+        if (max_use <= 0 && max_retention_usec <= 0)

                 return 0;
 
         if (max_retention_usec > 0) {
                 return 0;
 
         if (max_retention_usec > 0) {


@@ -180,9 +181,7 @@ int journal_directory_vacuum(
                 return -errno;
 
         for (;;) {
                 return -errno;
 
         for (;;) {

-                int k;

                 struct dirent *de;
                 struct dirent *de;

-                union dirent_storage buf;

                 size_t q;
                 struct stat st;
                 char *p;
                 size_t q;
                 struct stat st;
                 char *p;


@@ -190,9 +189,10 @@ int journal_directory_vacuum(
                 sd_id128_t seqnum_id;
                 bool have_seqnum;
 
                 sd_id128_t seqnum_id;
                 bool have_seqnum;
 

-                k = readdir_r(d, &buf.de, &de);
-                if (k != 0) {
-                        r = -k;
+                errno = 0;
+                de = readdir(d);
+                if (!de && errno != 0) {
+                        r = -errno;

                         goto finish;
                 }
 
                         goto finish;
                 }
 


@@ -272,18 +272,22 @@ int journal_directory_vacuum(
                         uint64_t size = 512UL * (uint64_t) st.st_blocks;
 
                         if (unlinkat(dirfd(d), p, 0) >= 0) {
                         uint64_t size = 512UL * (uint64_t) st.st_blocks;
 
                         if (unlinkat(dirfd(d), p, 0) >= 0) {

-                                log_info("Deleted empty journal %s/%s (%"PRIu64" bytes).",
-                                         directory, p, size);
+                                log_full(verbose ? LOG_INFO : LOG_DEBUG, "Deleted empty archived journal %s/%s (%s).", directory, p, format_bytes(sbytes, sizeof(sbytes), size));

                                 freed += size;
                         } else if (errno != ENOENT)
                                 freed += size;
                         } else if (errno != ENOENT)

-                                log_warning("Failed to delete %s/%s: %m", directory, p);
+                                log_warning("Failed to delete empty archived journal %s/%s: %m", directory, p);

 
 

+                        free(p);

                         continue;
                 }
 
                 patch_realtime(directory, p, &st, &realtime);
 
                         continue;
                 }
 
                 patch_realtime(directory, p, &st, &realtime);
 

-                GREEDY_REALLOC(list, n_allocated, n_list + 1);
+                if (!GREEDY_REALLOC(list, n_allocated, n_list + 1)) {
+                        free(p);
+                        r = -ENOMEM;
+                        goto finish;
+                }

 
                 list[n_list].filename = p;
                 list[n_list].usage = 512UL * (uint64_t) st.st_blocks;
 
                 list[n_list].filename = p;
                 list[n_list].usage = 512UL * (uint64_t) st.st_blocks;


@@ -297,25 +301,15 @@ int journal_directory_vacuum(
                 n_list ++;
         }
 
                 n_list ++;
         }
 

-        if (n_list > 0)
-                qsort(list, n_list, sizeof(struct vacuum_info), vacuum_compare);
+        qsort_safe(list, n_list, sizeof(struct vacuum_info), vacuum_compare);

 
         for (i = 0; i < n_list; i++) {
 
         for (i = 0; i < n_list; i++) {

-                struct statvfs ss;
-
-                if (fstatvfs(dirfd(d), &ss) < 0) {
-                        r = -errno;
-                        goto finish;
-                }
-

                 if ((max_retention_usec <= 0 || list[i].realtime >= retention_limit) &&
                 if ((max_retention_usec <= 0 || list[i].realtime >= retention_limit) &&

-                    (max_use <= 0 || sum <= max_use) &&
-                    (min_free <= 0 || (uint64_t) ss.f_bavail * (uint64_t) ss.f_bsize >= min_free))
+                    (max_use <= 0 || sum <= max_use))

                         break;
 
                 if (unlinkat(dirfd(d), list[i].filename, 0) >= 0) {
                         break;
 
                 if (unlinkat(dirfd(d), list[i].filename, 0) >= 0) {

-                        log_debug("Deleted archived journal %s/%s (%"PRIu64" bytes).",
-                                  directory, list[i].filename, list[i].usage);
+                        log_full(verbose ? LOG_INFO : LOG_DEBUG, "Deleted archived journal %s/%s (%s).", directory, list[i].filename, format_bytes(sbytes, sizeof(sbytes), list[i].usage));

                         freed += list[i].usage;
 
                         if (list[i].usage < sum)
                         freed += list[i].usage;
 
                         if (list[i].usage < sum)


@@ -324,7 +318,7 @@ int journal_directory_vacuum(
                                 sum = 0;
 
                 } else if (errno != ENOENT)
                                 sum = 0;
 
                 } else if (errno != ENOENT)

-                        log_warning("Failed to delete %s/%s: %m", directory, list[i].filename);
+                        log_warning("Failed to delete archived journal %s/%s: %m", directory, list[i].filename);

         }
 
         if (oldest_usec && i < n_list && (*oldest_usec == 0 || list[i].realtime < *oldest_usec))
         }
 
         if (oldest_usec && i < n_list && (*oldest_usec == 0 || list[i].realtime < *oldest_usec))


@@ -335,7 +329,7 @@ finish:
                 free(list[i].filename);
         free(list);
 
                 free(list[i].filename);
         free(list);
 

-        log_info("Vacuuming done, freed %"PRIu64" bytes", freed);
+        log_full(verbose ? LOG_INFO : LOG_DEBUG, "Vacuuming done, freed %s of archived journals on disk.", format_bytes(sbytes, sizeof(sbytes), freed));

 
         return r;
 }
 
         return r;
 }