RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-16 18:35:07 +00:00
Code Issues Activity Actions

Kernel: Support chdir() to a directory that's executable but not readable.

Browse source 
Also the superuser should be allowed to resolve any possible path without
getting tripped up by EACCES.
This commit is contained in:
Andreas Kling 2019-03-01 23:54:07 +01:00
parent 4f9b6a88a6
commit f75eb9af16
3 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Kernel/Process.cpp
View file

@ -1273,13 +1273,10 @@ int Process::sys$chdir(const char* path)
{ {
if (!validate_read_str(path)) if (!validate_read_str(path))
return -EFAULT; return -EFAULT;
int error; auto directory_or_error = VFS::the().open_directory(String(path), cwd_inode());
auto descriptor = VFS::the().open(path, error, 0, 0, cwd_inode()); if (directory_or_error.is_error())
if (!descriptor) return directory_or_error.error();
return error; m_cwd = *directory_or_error.value();
if (!descriptor->is_directory())
return -ENOTDIR;
m_cwd = descriptor->inode();
return 0; return 0;
} }

15
Kernel/VirtualFileSystem.cpp
View file

@ -290,6 +290,19 @@ KResult VFS::access(const String& path, int mode, Inode& base)
return KSuccess; return KSuccess;
} }
KResultOr<Retained<Inode>> VFS::open_directory(const String& path, Inode& base)
{
auto inode_or_error = resolve_path_to_inode(path, base);
if (inode_or_error.is_error())
return inode_or_error.error();
auto inode = inode_or_error.value();
if (!inode->is_directory())
return KResult(-ENOTDIR);
if (!inode->metadata().may_execute(*current) && !current->is_superuser())
return KResult(-EACCES);
return Retained<Inode>(*inode);
}
KResult VFS::chmod(Inode& inode, mode_t mode) KResult VFS::chmod(Inode& inode, mode_t mode)
{ {
if (inode.fs().is_readonly()) if (inode.fs().is_readonly())
@ -554,7 +567,7 @@ KResultOr<InodeIdentifier> VFS::resolve_path(const String& path, InodeIdentifier
#endif #endif
return KResult(-ENOTDIR); return KResult(-ENOTDIR);
} }
if (!metadata.may_execute(*current)) if (!metadata.may_execute(*current) && !current->is_superuser())
return KResult(-EACCES); return KResult(-EACCES);
auto parent = crumb_id; auto parent = crumb_id;
crumb_id = crumb_inode->lookup(part); crumb_id = crumb_inode->lookup(part);

1
Kernel/VirtualFileSystem.h
View file

@ -75,6 +75,7 @@ public:
KResult access(const String& path, int mode, Inode& base); KResult access(const String& path, int mode, Inode& base);
bool stat(const String& path, int& error, int options, Inode& base, struct stat&); bool stat(const String& path, int& error, int options, Inode& base, struct stat&);
KResult utime(const String& path, Inode& base, time_t atime, time_t mtime); KResult utime(const String& path, Inode& base, time_t atime, time_t mtime);
KResultOr<Retained<Inode>> open_directory(const String& path, Inode& base);
void register_device(Device&); void register_device(Device&);
void unregister_device(Device&); void unregister_device(Device&);