From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sun, 21 Jan 2018 10:19:25 +0000 (+0900)
Subject: fs-util: chase_symlinks(): prevent double free
X-Git-Tag: v237~64^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b539437a056953cb0b537db4af61f1f1bf97ed44;p=thirdparty%2Fsystemd.git

fs-util: chase_symlinks(): prevent double free

Fixes CID #1385316.
---

diff --git a/src/basic/fs-util.c b/src/basic/fs-util.c
index 87d743b617b..a8e50d4c785 100644
--- a/src/basic/fs-util.c
+++ b/src/basic/fs-util.c
@@ -834,8 +834,6 @@ int chase_symlinks(const char *path, const char *original_root, unsigned flags,
                                 if (fd < 0)
                                         return -errno;
 
-                                free(done);
-
                                 if (flags & CHASE_SAFE) {
                                         if (fstat(fd, &st) < 0)
                                                 return -errno;
@@ -846,6 +844,8 @@ int chase_symlinks(const char *path, const char *original_root, unsigned flags,
                                         previous_stat = st;
                                 }
 
+                                free(done);
+
                                 /* Note that we do not revalidate the root, we take it as is. */
                                 if (isempty(root))
                                         done = NULL;