about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorNicolas Koch <nioko1337@gmail.com>2018-06-01 09:32:20 +0200
committerNicolas Koch <nioko1337@gmail.com>2018-06-01 09:32:20 +0200
commit2c3eff99f0cc0bb460f9068c553e5d029e7b7ec3 (patch)
tree6e2c00f72d6833a47c354daba3acad8206a6f3aa /src/libstd
parent63cd4a39ead1bdcc6f4df5f11d187916bd8d3ea7 (diff)
downloadrust-2c3eff99f0cc0bb460f9068c553e5d029e7b7ec3.tar.gz
rust-2c3eff99f0cc0bb460f9068c553e5d029e7b7ec3.zip
fs: copy: Add EPERM to fallback error conditions
Fixes #51266
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/sys/unix/fs.rs17
1 files changed, 12 insertions, 5 deletions
diff --git a/src/libstd/sys/unix/fs.rs b/src/libstd/sys/unix/fs.rs
index c4092dcd388..774340388e1 100644
--- a/src/libstd/sys/unix/fs.rs
+++ b/src/libstd/sys/unix/fs.rs
@@ -890,8 +890,11 @@ pub fn copy(from: &Path, to: &Path) -> io::Result<u64> {
                     )
             };
             if let Err(ref copy_err) = copy_result {
-                if let Some(libc::ENOSYS) = copy_err.raw_os_error() {
-                    HAS_COPY_FILE_RANGE.store(false, Ordering::Relaxed);
+                match copy_err.raw_os_error() {
+                    Some(libc::ENOSYS) | Some(libc::EPERM) => {
+                        HAS_COPY_FILE_RANGE.store(false, Ordering::Relaxed);
+                    }
+                    _ => {}
                 }
             }
             copy_result
@@ -902,9 +905,13 @@ pub fn copy(from: &Path, to: &Path) -> io::Result<u64> {
             Ok(ret) => written += ret as u64,
             Err(err) => {
                 match err.raw_os_error() {
-                    Some(os_err) if os_err == libc::ENOSYS || os_err == libc::EXDEV => {
-                        // Either kernel is too old or the files are not mounted on the same fs.
-                        // Try again with fallback method
+                    Some(os_err) if os_err == libc::ENOSYS
+                                 || os_err == libc::EXDEV
+                                 || os_err == libc::EPERM => {
+                        // Try fallback io::copy if either:
+                        // - Kernel version is < 4.5 (ENOSYS)
+                        // - Files are mounted on different fs (EXDEV)
+                        // - copy_file_range is disallowed, for example by seccomp (EPERM)
                         assert_eq!(written, 0);
                         let ret = io::copy(&mut reader, &mut writer)?;
                         writer.set_permissions(perm)?;