netbird/gvisor
0
0
Fork 0
mirror of https://github.com/netbirdio/gvisor.git synced 2026-05-22 17:12:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3469 from craig08:fuse-fix-test-mount-failed

Browse Source 
PiperOrigin-RevId: 324657612
This commit is contained in:
gVisor bot
2020-08-03 12:27:03 -07:00
parent 1a93a78d10 e76c3c1064
commit 07267fc4c0
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/syscalls/linux/mount.cc
+14
View File
@@ -326,6 +326,14 @@ TEST(MountTest, MountFuseFilesystemNoDevice) {
SKIP_IF(IsRunningOnGvisor() && !IsFUSEEnabled());
auto const dir = ASSERT_NO_ERRNO_AND_VALUE(TempPath::CreateDir());
// Before kernel version 4.16-rc6, FUSE mount is protected by
// capable(CAP_SYS_ADMIN). After this version, it uses
// ns_capable(CAP_SYS_ADMIN) to protect. Before the 4.16 kernel, it was not
// allowed to mount fuse file systems without the global CAP_SYS_ADMIN.
int res = mount("", dir.path().c_str(), "fuse", 0, "");
SKIP_IF(!IsRunningOnGvisor() && res == -1 && errno == EPERM);
EXPECT_THAT(mount("", dir.path().c_str(), "fuse", 0, ""),
SyscallFailsWithErrno(EINVAL));
}
@@ -339,6 +347,12 @@ TEST(MountTest, MountFuseFilesystem) {
std::string mopts = "fd=" + std::to_string(fd.get());
auto const dir = ASSERT_NO_ERRNO_AND_VALUE(TempPath::CreateDir());
// See comments in MountFuseFilesystemNoDevice for the reason why we skip
// EPERM when running on Linux.
int res = mount("", dir.path().c_str(), "fuse", 0, "");
SKIP_IF(!IsRunningOnGvisor() && res == -1 && errno == EPERM);
auto const mount =
ASSERT_NO_ERRNO_AND_VALUE(Mount("", dir.path(), "fuse", 0, mopts, 0));
}