Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-27 03:13:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correct the behavior when operating the root directory

Browse Source
This commit is contained in:
Shaowei Song
2024-11-13 08:06:52 +00:00
committed by Tate, Hongliang Tian
parent ac71234b89
commit e453649d78
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
kernel/src/fs/fs_resolver.rs
View File

@ -202,7 +202,6 @@ impl FsResolver {
return_errno_with_message!(Errno::ENAMETOOLONG, "path is too long"); return_errno_with_message!(Errno::ENAMETOOLONG, "path is too long");
} }
if relative_path.is_empty() { if relative_path.is_empty() {
assert!(!lookup_ctx.stop_on_parent);
return Ok(parent.clone()); return Ok(parent.clone());
} }
@ -335,7 +334,11 @@ impl FsResolver {
let (follow_tail_link, stop_on_parent) = (false, true); let (follow_tail_link, stop_on_parent) = (false, true);
let mut lookup_ctx = LookupCtx::new(follow_tail_link, stop_on_parent); let mut lookup_ctx = LookupCtx::new(follow_tail_link, stop_on_parent);
let parent_dir = self.lookup_inner(path, &mut lookup_ctx)?; let parent_dir = self.lookup_inner(path, &mut lookup_ctx)?;
let tail_file_name = lookup_ctx.tail_file_name().unwrap(); let tail_file_name = lookup_ctx.tail_file_name().ok_or_else(|| {
// If the path is the root directory ("/"), there is no basename,
// so this operation is not allowed.
Error::with_message(Errno::EEXIST, "operation not allowed on root directory")
})?;
if parent_dir if parent_dir
.lookup(tail_file_name.trim_end_matches('/')) .lookup(tail_file_name.trim_end_matches('/'))