Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-14 07:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't check access mode if the file is being created

Browse Source
This commit is contained in:
YanWQ-monad 2024-07-10 22:17:08 +08:00 committed by Tate, Hongliang Tian
parent fbf2afd799
commit bffc34c94b
4 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
kernel/aster-nix/src/fs/fs_resolver.rs
View File

@ -70,7 +70,7 @@ impl FsResolver {
let follow_tail_link = !(creation_flags.contains(CreationFlags::O_NOFOLLOW) let follow_tail_link = !(creation_flags.contains(CreationFlags::O_NOFOLLOW)
|| creation_flags.contains(CreationFlags::O_CREAT) || creation_flags.contains(CreationFlags::O_CREAT)
&& creation_flags.contains(CreationFlags::O_EXCL)); && creation_flags.contains(CreationFlags::O_EXCL));
let dentry = match self.lookup_inner(path, follow_tail_link) { let inode_handle = match self.lookup_inner(path, follow_tail_link) {
Ok(dentry) => { Ok(dentry) => {
let inode = dentry.inode(); let inode = dentry.inode();
if inode.type_() == InodeType::SymLink if inode.type_() == InodeType::SymLink
@ -92,7 +92,11 @@ impl FsResolver {
"O_DIRECTORY is specified but file is not a directory" "O_DIRECTORY is specified but file is not a directory"
); );
} }
dentry
if creation_flags.contains(CreationFlags::O_TRUNC) {
dentry.resize(0)?;
}
InodeHandle::new(dentry, access_mode, status_flags)?
} }
Err(e) Err(e)
if e.error() == Errno::ENOENT if e.error() == Errno::ENOENT
@ -109,17 +113,14 @@ impl FsResolver {
if !dir_dentry.mode()?.is_writable() { if !dir_dentry.mode()?.is_writable() {
return_errno_with_message!(Errno::EACCES, "file cannot be created"); return_errno_with_message!(Errno::EACCES, "file cannot be created");
} }
dir_dentry.new_fs_child(&file_name, InodeType::File, inode_mode)?
let dentry = dir_dentry.new_fs_child(&file_name, InodeType::File, inode_mode)?;
// Don't check access mode for newly created file
InodeHandle::new_unchecked_access(dentry, access_mode, status_flags)?
} }
Err(e) => return Err(e), Err(e) => return Err(e),
}; };
if creation_flags.contains(CreationFlags::O_TRUNC) {
dentry.resize(0)?;
}
let inode_handle = InodeHandle::new(dentry, access_mode, status_flags)?;
Ok(inode_handle) Ok(inode_handle)
} }

10
kernel/aster-nix/src/fs/inode_handle/dyn_cap.rs
View File

@ -19,6 +19,16 @@ impl InodeHandle<Rights> {
if access_mode.is_writable() && !inode.mode()?.is_writable() { if access_mode.is_writable() && !inode.mode()?.is_writable() {
return_errno_with_message!(Errno::EACCES, "File is not writable"); return_errno_with_message!(Errno::EACCES, "File is not writable");
} }
Self::new_unchecked_access(dentry, access_mode, status_flags)
}
pub fn new_unchecked_access(
dentry: Arc<Dentry>,
access_mode: AccessMode,
status_flags: StatusFlags,
) -> Result<Self> {
let inode = dentry.inode();
if access_mode.is_writable() && inode.type_() == InodeType::Dir { if access_mode.is_writable() && inode.type_() == InodeType::Dir {
return_errno_with_message!(Errno::EISDIR, "Directory cannot open to write"); return_errno_with_message!(Errno::EISDIR, "Directory cannot open to write");
} }

4
test/syscall_test/blocklists.exfat/open_create_test Normal file
View File

@ -0,0 +1,4 @@
CreateTest.ChmodReadToWriteBetweenOpens_NoRandomSave
CreateTest.ChmodWriteToReadBetweenOpens_NoRandomSave
CreateTest.CreateWithReadFlagNotAllowedByMode_NoRandomSave
CreateTest.CreateWithWriteFlagNotAllowedByMode_NoRandomSave

4
test/syscall_test/blocklists/open_create_test
View File

@ -3,7 +3,3 @@ CreateTest.CreatWithOTrunc
CreateTest.CreatDirWithOTruncAndReadOnly CreateTest.CreatDirWithOTruncAndReadOnly
CreateTest.CreateFailsOnUnpermittedDir CreateTest.CreateFailsOnUnpermittedDir
CreateTest.CreateFailsOnDirWithoutWritePerms CreateTest.CreateFailsOnDirWithoutWritePerms
CreateTest.ChmodReadToWriteBetweenOpens_NoRandomSave
CreateTest.ChmodWriteToReadBetweenOpens_NoRandomSave
CreateTest.CreateWithReadFlagNotAllowedByMode_NoRandomSave
CreateTest.CreateWithWriteFlagNotAllowedByMode_NoRandomSave