mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-23 15:23:46 +00:00
Rollup merge of #93847 - solid-rs:fix-kmc-solid-fs-ts, r=yaahc
kmc-solid: Use the filesystem thread-safety wrapper Fixes the thread unsafety of the `std::fs` implementation used by the [`*-kmc-solid_*`](https://doc.rust-lang.org/nightly/rustc/platform-support/kmc-solid.html) Tier 3 targets. Neither the SOLID filesystem API nor built-in filesystem drivers guarantee thread safety by default. Although this may suffice in general embedded-system use cases, and in fact the API can be used from multiple threads without any problems in many cases, this has been a source of unsoundness in `std::sys::solid::fs`. This commit updates the implementation to leverage the filesystem thread-safety wrapper (which uses a pluggable synchronization mechanism) to enforce thread safety. This is done by prefixing all paths passed to the filesystem API with `\TS`. (Note that relative paths aren't supported in this platform.)
This commit is contained in:
commit
724cca6d7f
@ -289,7 +289,26 @@ impl OpenOptions {
|
||||
}
|
||||
|
||||
fn cstr(path: &Path) -> io::Result<CString> {
|
||||
Ok(CString::new(path.as_os_str().as_bytes())?)
|
||||
let path = path.as_os_str().as_bytes();
|
||||
|
||||
if !path.starts_with(br"\") {
|
||||
// Relative paths aren't supported
|
||||
return Err(crate::io::const_io_error!(
|
||||
crate::io::ErrorKind::Unsupported,
|
||||
"relative path is not supported on this platform",
|
||||
));
|
||||
}
|
||||
|
||||
// Apply the thread-safety wrapper
|
||||
const SAFE_PREFIX: &[u8] = br"\TS";
|
||||
let wrapped_path = [SAFE_PREFIX, &path, &[0]].concat();
|
||||
|
||||
CString::from_vec_with_nul(wrapped_path).map_err(|_| {
|
||||
crate::io::const_io_error!(
|
||||
io::ErrorKind::InvalidInput,
|
||||
"path provided contains a nul byte",
|
||||
)
|
||||
})
|
||||
}
|
||||
|
||||
impl File {
|
||||
|
Loading…
Reference in New Issue
Block a user