Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-06-01 22:18:23 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #156448 - RalfJung:miri, r=RalfJung

Browse Source 
miri subtree update

Subtree update of `miri` to https://github.com/rust-lang/miri/commit/39301e961f9536e22ff6fdc678c9ee6153333f1a.

Created using https://github.com/rust-lang/josh-sync.

Out-of-schedule sync to avoid nasty surprises when isolation doesn't work (but also see https://github.com/rust-lang/miri/pull/5025)

r? @ghost
This commit is contained in:
Jonathan Brouwer
2026-05-11 23:03:02 +02:00
committed by GitHub
parent 64a965e901 b37dbc42e7
commit baa75e41d2
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tools/miri/src/shims/unix/fs.rs
+12
View File
@@ -863,6 +863,12 @@ fn chmod(&mut self, path_op: &OpTy<'tcx>, mode_op: &OpTy<'tcx>) -> InterpResult<
}
let path = this.read_path_from_c_str(path_ptr)?;
// Reject if isolation is enabled.
if let IsolatedOp::Reject(reject_with) = this.machine.isolated_op {
this.reject_in_isolation("`chmod`", reject_with)?;
return this.set_last_error_and_return_i32(LibcError("EACCES"));
}
let permissions = this.host_permissions_from_mode(mode.try_into().unwrap())?;
if let Err(err) = fs::set_permissions(path, permissions) {
return this.set_last_error_and_return_i32(IoError::HostError(err));
@@ -885,6 +891,12 @@ fn fchmod(&mut self, fd_op: &OpTy<'tcx>, mode_op: &OpTy<'tcx>) -> InterpResult<'
throw_unsup_format!("`fchmod` is only supported on regular files")
};
// Reject if isolation is enabled.
if let IsolatedOp::Reject(reject_with) = this.machine.isolated_op {
this.reject_in_isolation("`fchmod`", reject_with)?;
return this.set_last_error_and_return_i32(LibcError("EACCES"));
}
let permissions = this.host_permissions_from_mode(mode.try_into().unwrap())?;
if let Err(err) = file.file.set_permissions(permissions) {
return this.set_last_error_and_return_i32(IoError::HostError(err));