diff options
| author | Pavel Tikhomirov <ptikhomirov@virtuozzo.com> | 2022-06-17 14:38:28 +0300 |
|---|---|---|
| committer | Andrei Vagin <avagin@gmail.com> | 2022-06-20 18:47:09 +0300 |
| commit | dc160c0d89587ae5ca793659f08619702fcad49d (patch) | |
| tree | ed46cfc4f3c60d878bb0f265c97f53fac424d87c /criu | |
| parent | fa6efbfe852e9e85708bc2b785afd9be42af95a3 (diff) | |
util/mount-v2: fix resolve_mountpoint() to always return freeable pointer
Else we have a Segmentation fault in __move_mount_set_group() on
xfree(source_mp) if resolve_mountpoint() returned statically allocated
path.
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Diffstat (limited to 'criu')
| -rw-r--r-- | criu/util.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/criu/util.c b/criu/util.c index 40b12bace..5f69465b4 100644 --- a/criu/util.c +++ b/criu/util.c @@ -2021,6 +2021,10 @@ char *resolve_mountpoint(char *path) char *mp_path, *free_path; bool is_mountpoint; + /* + * The dirname() function may modify the contents of given path, + * so we need a strdup here to preserve path. + */ mp_path = free_path = xstrdup(path); if (!mp_path) return NULL; @@ -2031,7 +2035,7 @@ char *resolve_mountpoint(char *path) * by openat2 RESOLVE_NO_XDEV, let's just assume they are. */ if (is_same_path(mp_path, "/")) - return mp_path; + goto out; if (path_is_mountpoint(mp_path, &is_mountpoint) == -1) { xfree(free_path); @@ -2039,7 +2043,7 @@ char *resolve_mountpoint(char *path) } if (is_mountpoint) - return mp_path; + goto out; /* Try parent directory */ mp_path = dirname(mp_path); @@ -2048,4 +2052,14 @@ char *resolve_mountpoint(char *path) /* never get here */ xfree(free_path); return NULL; +out: + /* + * The dirname() function may or may not return statically allocated + * strings, so here mp_path can be either dynamically allocated or + * statically allocated. Let's strdup to make the return pointer + * always freeable. + */ + mp_path = xstrdup(mp_path); + xfree(free_path); + return mp_path; } |