mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2025-02-11 04:26:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

devices: fs: Ignore umask

Browse source 
We don't set FUSE_DONT_MASK so the guest kernel will apply the umask
to the mode before sending the request.  Just pass it on unmodified.

BUG=b:152806644
TEST=vm.Virtiofs

Change-Id: Id0c138e9ccc3a361a2772ac144f1d3413b545d99
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2253492
Auto-Submit: Chirantan Ekbote <chirantan@chromium.org>
Reviewed-by: Stephen Barber <smbarber@chromium.org>
Tested-by: Chirantan Ekbote <chirantan@chromium.org>
Commit-Queue: Chirantan Ekbote <chirantan@chromium.org>
This commit is contained in:
Chirantan Ekbote 2020-06-19 15:40:51 +09:00 committed by Commit Bot
parent 9fd8540ab0
commit ad356fb327
1 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
devices/src/virtio/fs/passthrough.rs
View file

@ -1084,7 +1084,7 @@ impl FileSystem for PassthroughFs {
parent: Inode,
name: &CStr,
mode: u32,
umask: u32,
_umask: u32,
) -> io::Result<Entry> {
// This method has the same issues as `create()`: namely that the kernel may have allowed a
// process to make a directory due to one of its supplementary groups but that information
@ -1111,7 +1111,7 @@ impl FileSystem for PassthroughFs {
}
// Set the mode. Safe because this doesn't modify any memory and we check the return value.
let ret = unsafe { libc::fchmod(tmpdir.as_raw_fd(), mode & !umask) };
let ret = unsafe { libc::fchmod(tmpdir.as_raw_fd(), mode) };
if ret < 0 {
return Err(io::Error::last_os_error());
}
@ -1236,7 +1236,7 @@ impl FileSystem for PassthroughFs {
name: &CStr,
mode: u32,
flags: u32,
umask: u32,
_umask: u32,
) -> io::Result<(Entry, Option<Handle>, OpenOptions)> {
// The `Context` may not contain all the information we need to create the file here. For
// example, a process may be part of several groups, one of which gives it permission to
@ -1270,14 +1270,8 @@ impl FileSystem for PassthroughFs {
let current_dir = unsafe { CStr::from_bytes_with_nul_unchecked(b".\0") };
// Safe because this doesn't modify any memory and we check the return value.
let fd = unsafe {
libc::openat(
data.file.as_raw_fd(),
current_dir.as_ptr(),
tmpflags,
mode & !(umask & 0o777),
)
};
let fd =
unsafe { libc::openat(data.file.as_raw_fd(), current_dir.as_ptr(), tmpflags, mode) };
if fd < 0 {
return Err(io::Error::last_os_error());
}
@ -1581,7 +1575,7 @@ impl FileSystem for PassthroughFs {
name: &CStr,
mode: u32,
rdev: u32,
umask: u32,
_umask: u32,
) -> io::Result<Entry> {
let (_uid, _gid) = set_creds(ctx.uid, ctx.gid)?;
let data = self
@ -1596,7 +1590,7 @@ impl FileSystem for PassthroughFs {
libc::mknodat(
data.file.as_raw_fd(),
name.as_ptr(),
(mode & !umask) as libc::mode_t,
mode as libc::mode_t,
rdev as libc::dev_t,
)
};