Mirrors/criu
1
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu.git synced 2026-01-23 02:14:37 +00:00
Code Issues Projects Releases Wiki Activity

util/mount-v2: fix resolve_mountpoint() to always return freeable pointer

Browse source 
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>
This commit is contained in:
Pavel Tikhomirov 2022-06-17 14:38:28 +03:00 • committed by Andrei Vagin
parent 4cc8a18f3b
commit 8a18faea09
1 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

18
criu/util.c
View file

@ -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;
}