brl/pH
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove canonicalization since it doesn't work.

Browse Source
This commit is contained in:
Bruce Leidl 2019-09-22 00:50:32 -04:00
parent 2dec4334f4
commit 078a1a547b
1 changed files with 0 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/devices/virtio_9p/filesystem.rs
View File

@ -91,23 +91,6 @@ impl FileSystem {
fn metadata(&self, path: &Path) -> io::Result<Metadata> { fn metadata(&self, path: &Path) -> io::Result<Metadata> {
path.symlink_metadata() path.symlink_metadata()
} }
fn canonicalize_parent(&self, path: &Path) -> io::Result<PathBuf> {
let parent = path.parent()
.ok_or(io::Error::from_raw_os_error(libc::ENOENT))?;
let parent = self.canonicalize(parent)?;
let filename = path.file_name()
.ok_or(io::Error::from_raw_os_error(libc::ENOENT))?;
Ok(parent.join(filename))
}
fn canonicalize(&self, path: &Path) -> io::Result<PathBuf> {
let canon = path.canonicalize()?;
if !canon.starts_with(&self.root) {
return Err(io::Error::from_raw_os_error(libc::EIO))
}
Ok(canon)
}
} }
fn cstr(path: &Path) -> io::Result<CString> { fn cstr(path: &Path) -> io::Result<CString> {
@ -152,19 +135,16 @@ impl FileSystemOps for FileSystem {
} }
fn open(&self, path: &Path, flags: u32) -> io::Result<P9File> { fn open(&self, path: &Path, flags: u32) -> io::Result<P9File> {
let path = self.canonicalize(path)?;
let file =FileSystem::open_with_flags(&path, flags, self.euid_root)?; let file =FileSystem::open_with_flags(&path, flags, self.euid_root)?;
Ok(self.new_file(file)) Ok(self.new_file(file))
} }
fn create(&self, path: &Path, flags: u32, mode: u32) -> io::Result<P9File> { fn create(&self, path: &Path, flags: u32, mode: u32) -> io::Result<P9File> {
let path = self.canonicalize_parent(path)?;
let file = FileSystem::create_with_flags(&path, flags, mode, self.euid_root)?; let file = FileSystem::create_with_flags(&path, flags, mode, self.euid_root)?;
Ok(self.new_file(file)) Ok(self.new_file(file))
} }
fn write_statfs(&self, path: &Path, pp: &mut PduParser) -> io::Result<()> { fn write_statfs(&self, path: &Path, pp: &mut PduParser) -> io::Result<()> {
let path = self.canonicalize(path)?;
let path_cstr = cstr(&path)?; let path_cstr = cstr(&path)?;
let mut statfs: libc::statfs64 = unsafe { mem::zeroed() }; let mut statfs: libc::statfs64 = unsafe { mem::zeroed() };
@ -187,7 +167,6 @@ impl FileSystemOps for FileSystem {
} }
fn chown(&self, path: &Path, uid: u32, gid: u32) -> io::Result<()> { fn chown(&self, path: &Path, uid: u32, gid: u32) -> io::Result<()> {
let path = self.canonicalize(path)?;
let path_cstr = cstr(&path)?; let path_cstr = cstr(&path)?;
unsafe { unsafe {
if libc::chown(path_cstr.as_ptr(), uid, gid) < 0 { if libc::chown(path_cstr.as_ptr(), uid, gid) < 0 {
@ -203,7 +182,6 @@ impl FileSystemOps for FileSystem {
} }
fn touch(&self, path: &Path, which: FsTouch, tv: (u64, u64)) -> io::Result<()> { fn touch(&self, path: &Path, which: FsTouch, tv: (u64, u64)) -> io::Result<()> {
let path = self.canonicalize(path)?;
let path_cstr = cstr(&path)?; let path_cstr = cstr(&path)?;
let tval = libc::timespec { let tval = libc::timespec {
@ -234,7 +212,6 @@ impl FileSystemOps for FileSystem {
} }
fn truncate(&self, path: &Path, size: u64) -> io::Result<()> { fn truncate(&self, path: &Path, size: u64) -> io::Result<()> {
let path = self.canonicalize(path)?;
let path_cstr = cstr(&path)?; let path_cstr = cstr(&path)?;
unsafe { unsafe {
if libc::truncate64(path_cstr.as_ptr(), size as i64) < 0 { if libc::truncate64(path_cstr.as_ptr(), size as i64) < 0 {
@ -245,39 +222,30 @@ impl FileSystemOps for FileSystem {
} }
fn readlink(&self, path: &Path) -> io::Result<OsString> { fn readlink(&self, path: &Path) -> io::Result<OsString> {
let path = self.canonicalize_parent(path)?;
fs::read_link(&path).map(|pbuf| pbuf.into_os_string()) fs::read_link(&path).map(|pbuf| pbuf.into_os_string())
} }
fn symlink(&self, target: &Path, linkpath: &Path) -> io::Result<()> { fn symlink(&self, target: &Path, linkpath: &Path) -> io::Result<()> {
let linkpath = self.canonicalize_parent(linkpath)?;
unix::fs::symlink(target, linkpath) unix::fs::symlink(target, linkpath)
} }
fn link(&self, target: &Path, newpath: &Path) -> io::Result<()> { fn link(&self, target: &Path, newpath: &Path) -> io::Result<()> {
let target = self.canonicalize(target)?;
let newpath= self.canonicalize_parent(newpath)?;
fs::hard_link(target, newpath) fs::hard_link(target, newpath)
} }
fn rename(&self, from: &Path, to: &Path) -> io::Result<()> { fn rename(&self, from: &Path, to: &Path) -> io::Result<()> {
let from = self.canonicalize(from)?;
let to = self.canonicalize_parent(to)?;
fs::rename(from, to) fs::rename(from, to)
} }
fn remove_file(&self, path: &Path) -> io::Result<()> { fn remove_file(&self, path: &Path) -> io::Result<()> {
let path = self.canonicalize(path)?;
fs::remove_file(path) fs::remove_file(path)
} }
fn remove_dir(&self, path: &Path) -> io::Result<()> { fn remove_dir(&self, path: &Path) -> io::Result<()> {
let path = self.canonicalize(path)?;
fs::remove_dir(path) fs::remove_dir(path)
} }
fn create_dir(&self, path: &Path, mode: u32) -> io::Result<()> { fn create_dir(&self, path: &Path, mode: u32) -> io::Result<()> {
let path = self.canonicalize_parent(path)?;
fs::DirBuilder::new() fs::DirBuilder::new()
.recursive(false) .recursive(false)
.mode(mode & 0o755) .mode(mode & 0o755)