From cca09ee8d6ece8e22b638efd05c4c0eb49e91b91 Mon Sep 17 00:00:00 2001 From: Filipe Brandenburger Date: Mon, 4 Jun 2018 14:23:14 -0700 Subject: [PATCH] copy: only check for traversing mount points on directories This fixes the copy routines on overlay filesystem, which typically returns the underlying st_dev for files, symlinks, etc. The value of st_dev is guaranteed to be the same for directories, so checking it on directories only fixes this code on overlay filesystem and still keeps it from traversing mount points (which was the original intent.) There's a small side effect here, by which regular (non-directory) files with bind mounts will be copied by the new logic (while they were skipped by the previous logic.) Tested: ./build/test-copy with an overlay on /tmp. Fixes: #9134 --- src/basic/copy.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/basic/copy.c b/src/basic/copy.c index 18eea64a9..5962e4ce7 100644 --- a/src/basic/copy.c +++ b/src/basic/copy.c @@ -533,13 +533,12 @@ static int fd_copy_directory( continue; } - if (buf.st_dev != original_device) - continue; - - if (S_ISREG(buf.st_mode)) - q = fd_copy_regular(dirfd(d), de->d_name, &buf, fdt, de->d_name, override_uid, override_gid, copy_flags); - else if (S_ISDIR(buf.st_mode)) + if (S_ISDIR(buf.st_mode)) { + if (buf.st_dev != original_device) + continue; q = fd_copy_directory(dirfd(d), de->d_name, &buf, fdt, de->d_name, original_device, override_uid, override_gid, copy_flags); + } else if (S_ISREG(buf.st_mode)) + q = fd_copy_regular(dirfd(d), de->d_name, &buf, fdt, de->d_name, override_uid, override_gid, copy_flags); else if (S_ISLNK(buf.st_mode)) q = fd_copy_symlink(dirfd(d), de->d_name, &buf, fdt, de->d_name, override_uid, override_gid, copy_flags); else if (S_ISFIFO(buf.st_mode)) -- 2.30.2