Skip to content

chroot_realpath: do not add a separator after expanding a symlink #2422

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kolyshkin merged 1 commit into from
Oct 30, 2026
Merged

chroot_realpath: do not add a separator after expanding a symlink #2422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/libcrun/chroot_realpath.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ char *chroot_realpath(const char *chroot, const char *path, char resolved_path[]
strcat(link_path, path);
strcpy(copy_path, link_path);
path = copy_path;
continue;
}
#endif /* S_IFLNK */
if (!last_component) {
Expand Down
28 changes: 26 additions & 2 deletions tests/tests_libcrun_chroot_realpath.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,10 +254,13 @@ static void cleanup_symlink_tree (const char *root);

$root/file a regular file
$root/link -> file (relative, top level)
$root/linkdir -> dir (relative, top level)
$root/dir/file a regular file
$root/dir/link -> file (relative, nested)
$root/dir/up -> ../file (relative, with "..")
$root/dir/abs -> /file (absolute, i.e. $root/file)
$root/dir/updir -> .. (relative, to a directory)
$root/dir/absdir -> /dir (absolute, to a directory)

Return 0 on success and 77 to skip the test when the tree cannot be
created. */
Expand All @@ -284,6 +287,11 @@ make_symlink_tree (char *root, size_t root_size)
if (symlink ("file", path) < 0)
goto fail;

if (snprintf (path, sizeof (path), "%s/linkdir", root) >= (int) sizeof (path))
goto fail;
if (symlink ("dir", path) < 0)
goto fail;

if (snprintf (path, sizeof (path), "%s/dir", root) >= (int) sizeof (path))
goto fail;
if (mkdir (path, 0700) < 0)
Expand Down Expand Up @@ -311,6 +319,16 @@ make_symlink_tree (char *root, size_t root_size)
if (symlink ("/file", path) < 0)
goto fail;

if (snprintf (path, sizeof (path), "%s/dir/updir", root) >= (int) sizeof (path))
goto fail;
if (symlink ("..", path) < 0)
goto fail;

if (snprintf (path, sizeof (path), "%s/dir/absdir", root) >= (int) sizeof (path))
goto fail;
if (symlink ("/dir", path) < 0)
goto fail;

return 0;

fail:
Expand All @@ -322,7 +340,7 @@ static void
cleanup_symlink_tree (const char *root)
{
char path[PATH_MAX];
const char *files[] = { "dir/abs", "dir/up", "dir/link", "dir/file", "dir", "link", "file", NULL };
const char *files[] = { "dir/absdir", "dir/updir", "dir/abs", "dir/up", "dir/link", "dir/file", "dir", "linkdir", "link", "file", NULL };
size_t i;

for (i = 0; files[i]; i++)
Expand All @@ -336,7 +354,8 @@ cleanup_symlink_tree (const char *root)
}

/* Expanding a symlink must not drop the separator between the parent
directory and the symlink target. */
directory and the symlink target, nor add an extra one when the
symlink is not the last component. */
static int
test_symlinks ()
{
Expand All @@ -349,6 +368,11 @@ test_symlinks ()
{ "/dir/link", "/dir/file" },
{ "/dir/up", "/file" },
{ "/dir/abs", "/file" },
{ "/linkdir/link", "/dir/file" },
{ "/dir/updir/file", "/file" },
{ "/dir/updir/dir/up", "/file" },
{ "/dir/absdir/file", "/dir/file" },
{ "/dir/absdir/updir/link", "/file" },
{ NULL, NULL },
};
char root[PATH_MAX];
Expand Down
Loading