RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 20:17:44 +00:00
Code Issues Activity Actions

Kernel: Fix not returning errors for the last path item.

Browse source 
Previously the check for an empty part would happen before the
check for access and for the parent being a directory, and so an
error in those would not be detected.
This commit is contained in:
Sergey Bugaev 2019-06-13 16:33:01 +03:00 • committed by Andreas Kling
parent 1a697f70db
commit 27203369b4
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Kernel/FileSystem/VirtualFileSystem.cpp
View file

@ -650,9 +650,6 @@ KResultOr<Retained<Custody>> VFS::resolve_path(StringView path, Custody& base, R
for (int i = 0; i < parts.size(); ++i) { for (int i = 0; i < parts.size(); ++i) {
bool inode_was_root_at_head_of_loop = crumb_id.is_root_inode(); bool inode_was_root_at_head_of_loop = crumb_id.is_root_inode();
auto& part = parts[i];
if (part.is_empty())
break;
auto crumb_inode = get_inode(crumb_id); auto crumb_inode = get_inode(crumb_id);
if (!crumb_inode) if (!crumb_inode)
return KResult(-EIO); return KResult(-EIO);
@ -661,6 +658,11 @@ KResultOr<Retained<Custody>> VFS::resolve_path(StringView path, Custody& base, R
return KResult(-ENOTDIR); return KResult(-ENOTDIR);
if (!metadata.may_execute(current->process())) if (!metadata.may_execute(current->process()))
return KResult(-EACCES); return KResult(-EACCES);
auto& part = parts[i];
if (part.is_empty())
break;
auto current_parent = custody_chain.last(); auto current_parent = custody_chain.last();
crumb_id = crumb_inode->lookup(part); crumb_id = crumb_inode->lookup(part);
if (!crumb_id.is_valid()) if (!crumb_id.is_valid())