Proxmox/proxmox
5
0
Fork 1
Code Issues Pull Requests Releases Activity

tools: fix create_path: don't use O_PATH

Browse Source 
open(2) says file descriptors opened with O_PATH cannot be
passed to fchmod(), fchown(), etc.

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2019-12-18 13:13:43 +01:00
parent 5e1468bff8
commit 3c284b131d
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
proxmox-tools/src/fs.rs
View File

@ -281,7 +281,7 @@ fn create_path_do(
let _ = iter.next();
Fd::open(
unsafe { CStr::from_bytes_with_nul_unchecked(b"/\0") },
OFlag::O_DIRECTORY | OFlag::O_PATH,
OFlag::O_DIRECTORY,
stat::Mode::empty(),
)?
}
@ -293,7 +293,7 @@ fn create_path_do(
let _ = iter.next();
Fd::open(
unsafe { CStr::from_bytes_with_nul_unchecked(b"..\0") },
OFlag::O_DIRECTORY | OFlag::O_PATH,
OFlag::O_DIRECTORY,
stat::Mode::empty(),
)?
}
@ -323,7 +323,7 @@ fn create_path_at_do(
at = Fd::openat(
at,
unsafe { CStr::from_bytes_with_nul_unchecked(b"..\0") },
OFlag::O_DIRECTORY | OFlag::O_PATH,
OFlag::O_DIRECTORY,
stat::Mode::empty(),
)?;
}
@ -346,12 +346,7 @@ fn create_path_at_do(
Err(e) => return Err(e.into()),
Ok(_) => true,
};
at = Fd::openat(
at,
path,
OFlag::O_DIRECTORY | OFlag::O_PATH,
stat::Mode::empty(),
)?;
at = Fd::openat(at, path, OFlag::O_DIRECTORY, stat::Mode::empty())?;
if let (true, Some(opts)) = (created, opts) {
if opts.owner.is_some() || opts.group.is_some() {
@ -366,6 +361,20 @@ fn create_path_at_do(
}
}
#[test]
fn test_create_path() {
create_path(
"testdir/testsub/testsub2/testfinal",
Some(CreateOptions::new().perm(stat::Mode::from_bits_truncate(0o755))),
Some(
CreateOptions::new()
.owner(Uid::effective())
.group(Gid::effective()),
),
)
.expect("expected create_path to work");
}
// /usr/include/linux/fs.h: #define BLKGETSIZE64 _IOR(0x12,114,size_t)
// return device size in bytes (u64 *arg)
nix::ioctl_read!(blkgetsize64, 0x12, 114, u64);