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

fs: Use openat64 instead of openat

Browse source 
This ensures that we can open files whose sizes may be larger than a
32-bit off_t.

BUG=b:181113648
TEST=emerge-kukui crosvm

Change-Id: I2322480dcf507f83609117b4def40846d619b69b
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3270100
Tested-by: kokoro <noreply+kokoro@google.com>
Commit-Queue: Chirantan Ekbote <chirantan@chromium.org>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
This commit is contained in:
Chirantan Ekbote 2021-11-09 16:52:01 +09:00 committed by Commit Bot
parent 55bf685478
commit 13f5e9b983
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -575,7 +575,7 @@ impl PassthroughFs {
// Safe because this doesn't modify any memory and we check the return value. // Safe because this doesn't modify any memory and we check the return value.
let raw_descriptor = syscall!(unsafe { let raw_descriptor = syscall!(unsafe {
libc::openat( libc::openat64(
libc::AT_FDCWD, libc::AT_FDCWD,
proc_cstr.as_ptr(), proc_cstr.as_ptr(),
libc::O_PATH | libc::O_NOFOLLOW | libc::O_CLOEXEC, libc::O_PATH | libc::O_NOFOLLOW | libc::O_CLOEXEC,
@ -682,7 +682,7 @@ impl PassthroughFs {
// have much bigger problems. Also, clear the `O_NOFOLLOW` flag if it is set since we need // have much bigger problems. Also, clear the `O_NOFOLLOW` flag if it is set since we need
// to follow the `/proc/self/fd` symlink to get the file. // to follow the `/proc/self/fd` symlink to get the file.
let raw_descriptor = syscall!(unsafe { let raw_descriptor = syscall!(unsafe {
libc::openat( libc::openat64(
self.proc.as_raw_descriptor(), self.proc.as_raw_descriptor(),
pathname.as_ptr(), pathname.as_ptr(),
(flags | libc::O_CLOEXEC) & !(libc::O_NOFOLLOW | libc::O_DIRECT), (flags | libc::O_CLOEXEC) & !(libc::O_NOFOLLOW | libc::O_DIRECT),
@ -791,7 +791,7 @@ impl PassthroughFs {
// Safe because this doesn't modify any memory and we check the return value. // Safe because this doesn't modify any memory and we check the return value.
let f = unsafe { let f = unsafe {
File::from_raw_descriptor(syscall!(libc::openat( File::from_raw_descriptor(syscall!(libc::openat64(
parent.as_raw_descriptor(), parent.as_raw_descriptor(),
name.as_ptr(), name.as_ptr(),
flags flags
@ -1345,7 +1345,7 @@ impl FileSystem for PassthroughFs {
let flags = libc::O_DIRECTORY | libc::O_NOFOLLOW | libc::O_CLOEXEC; let flags = libc::O_DIRECTORY | libc::O_NOFOLLOW | libc::O_CLOEXEC;
// Safe because this doesn't modify any memory and we check the return value. // Safe because this doesn't modify any memory and we check the return value.
let raw_descriptor = unsafe { libc::openat(libc::AT_FDCWD, root.as_ptr(), flags) }; let raw_descriptor = unsafe { libc::openat64(libc::AT_FDCWD, root.as_ptr(), flags) };
if raw_descriptor < 0 { if raw_descriptor < 0 {
return Err(io::Error::last_os_error()); return Err(io::Error::last_os_error());
} }
@ -1569,7 +1569,7 @@ impl FileSystem for PassthroughFs {
// Safe because this doesn't modify any memory and we check the return value. // Safe because this doesn't modify any memory and we check the return value.
syscall!(unsafe { syscall!(unsafe {
libc::openat( libc::openat64(
data.as_raw_descriptor(), data.as_raw_descriptor(),
current_dir.as_ptr(), current_dir.as_ptr(),
tmpflags, tmpflags,
@ -1608,7 +1608,7 @@ impl FileSystem for PassthroughFs {
// really check `flags` because if the kernel can't handle poorly specified flags then // really check `flags` because if the kernel can't handle poorly specified flags then
// we have much bigger problems. // we have much bigger problems.
syscall!(unsafe { syscall!(unsafe {
libc::openat(data.as_raw_descriptor(), name.as_ptr(), create_flags, mode) libc::openat64(data.as_raw_descriptor(), name.as_ptr(), create_flags, mode)
})? })?
}; };