proxmox-mirrors/proxmox
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox synced 2025-07-09 17:52:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

make_tmp_file: properly guard file descriptor

Browse Source 
and return an Fd

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2020-11-30 09:41:47 +01:00
parent b210ad69eb
commit 2216b348a1
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
proxmox/src/tools/fs.rs
View File

@ -3,7 +3,7 @@
use std::ffi::CStr; use std::ffi::CStr;
use std::fs::{File, OpenOptions}; use std::fs::{File, OpenOptions};
use std::io::{self, BufRead, BufReader, Write}; use std::io::{self, BufRead, BufReader, Write};
use std::os::unix::io::{AsRawFd, FromRawFd, RawFd}; use std::os::unix::io::{AsRawFd, FromRawFd, IntoRawFd, RawFd};
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use std::time::Duration; use std::time::Duration;
@ -126,14 +126,14 @@ pub fn file_read_firstline<P: AsRef<Path>>(path: P) -> Result<String, Error> {
pub fn make_tmp_file<P: AsRef<Path>>( pub fn make_tmp_file<P: AsRef<Path>>(
path: P, path: P,
options: CreateOptions, options: CreateOptions,
) -> Result<(RawFd, PathBuf), Error> { ) -> Result<(Fd, PathBuf), Error> {
let path = path.as_ref(); let path = path.as_ref();
// use mkstemp here, because it works with different processes, threads, even tokio tasks // use mkstemp here, because it works with different processes, threads, even tokio tasks
let mut template = path.to_owned(); let mut template = path.to_owned();
template.set_extension("tmp_XXXXXX"); template.set_extension("tmp_XXXXXX");
let (fd, tmp_path) = match unistd::mkstemp(&template) { let (fd, tmp_path) = match unistd::mkstemp(&template) {
Ok((fd, path)) => (fd, path), Ok((fd, path)) => (unsafe { Fd::from_raw_fd(fd) }, path),
Err(err) => bail!("mkstemp {:?} failed: {}", template, err), Err(err) => bail!("mkstemp {:?} failed: {}", template, err),
}; };
@ -143,13 +143,13 @@ pub fn make_tmp_file<P: AsRef<Path>>(
.perm .perm
.unwrap_or(stat::Mode::from_bits_truncate(0o644)); .unwrap_or(stat::Mode::from_bits_truncate(0o644));
if let Err(err) = stat::fchmod(fd, mode) { if let Err(err) = stat::fchmod(fd.as_raw_fd(), mode) {
let _ = unistd::unlink(&tmp_path); let _ = unistd::unlink(&tmp_path);
bail!("fchmod {:?} failed: {}", tmp_path, err); bail!("fchmod {:?} failed: {}", tmp_path, err);
} }
if options.owner.is_some() || options.group.is_some() { if options.owner.is_some() || options.group.is_some() {
if let Err(err) = fchown(fd, options.owner, options.group) { if let Err(err) = fchown(fd.as_raw_fd(), options.owner, options.group) {
let _ = unistd::unlink(&tmp_path); let _ = unistd::unlink(&tmp_path);
bail!("fchown {:?} failed: {}", tmp_path, err); bail!("fchown {:?} failed: {}", tmp_path, err);
} }
@ -168,7 +168,7 @@ pub fn replace_file<P: AsRef<Path>>(
) -> Result<(), Error> { ) -> Result<(), Error> {
let (fd, tmp_path) = make_tmp_file(&path, options)?; let (fd, tmp_path) = make_tmp_file(&path, options)?;
let mut file = unsafe { File::from_raw_fd(fd) }; let mut file = unsafe { File::from_raw_fd(fd.into_raw_fd()) };
if let Err(err) = file.write_all(data) { if let Err(err) = file.write_all(data) {
let _ = unistd::unlink(&tmp_path); let _ = unistd::unlink(&tmp_path);