RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-06-01 08:28:11 +00:00
Code Issues Activity Actions

Fix up VFS::resolveSymbolicLink() to use a base inode instead of a base path.

Browse source 
Also more VFS error plumbing.
This commit is contained in:
Andreas Kling 2018-10-28 14:25:51 +01:00
parent 97726862dd
commit bea106fdb2
4 changed files with 24 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Kernel/Task.cpp
View file

@ -234,11 +234,9 @@ Task* Task::createUserTask(const String& path, uid_t uid, gid_t gid, pid_t paren
cwd = parentTask->m_cwd.copyRef();
}
auto handle = VirtualFileSystem::the().open(path, 0, cwd ? cwd->inode : InodeIdentifier());
if (!handle) {
error = -ENOENT; // FIXME: Get a more detailed error from VFS.
auto handle = VirtualFileSystem::the().open(path, error, 0, cwd ? cwd->inode : InodeIdentifier());
if (!handle)
return nullptr;
}
if (!handle->metadata().mayExecute(uid, gid)) {
error = -EACCES;
@ -786,9 +784,10 @@ int Task::sys$close(int fd)
int Task::sys$lstat(const char* path, Unix::stat* statbuf)
{
VALIDATE_USER_BUFFER(statbuf, sizeof(Unix::stat));
auto handle = VirtualFileSystem::the().open(move(path), O_NOFOLLOW_NOERROR, cwdInode());
int error;
auto handle = VirtualFileSystem::the().open(move(path), error, O_NOFOLLOW_NOERROR, cwdInode());
if (!handle)
return -1;
return error;
handle->stat(statbuf);
return 0;
}
@ -798,9 +797,10 @@ int Task::sys$readlink(const char* path, char* buffer, size_t size)
VALIDATE_USER_BUFFER(path, strlen(path));
VALIDATE_USER_BUFFER(buffer, size);
auto handle = VirtualFileSystem::the().open(path, O_RDONLY | O_NOFOLLOW_NOERROR, cwdInode());
int error;
auto handle = VirtualFileSystem::the().open(path, error, O_RDONLY | O_NOFOLLOW_NOERROR, cwdInode());
if (!handle)
return -ENOENT; // FIXME: Get a more detailed error from VFS.
return error;
if (!handle->metadata().isSymbolicLink())
return -EINVAL;
@ -818,9 +818,10 @@ int Task::sys$readlink(const char* path, char* buffer, size_t size)
int Task::sys$chdir(const char* path)
{
VALIDATE_USER_BUFFER(path, strlen(path));
auto handle = VirtualFileSystem::the().open(path, 0, cwdInode());
int error;
auto handle = VirtualFileSystem::the().open(path, error, 0, cwdInode());
if (!handle)
return -ENOENT; // FIXME: More detailed error.
return error;
if (!handle->isDirectory())
return -ENOTDIR;
m_cwd = handle->vnode();
@ -842,9 +843,10 @@ int Task::sys$open(const char* path, int options)
VALIDATE_USER_BUFFER(path, strlen(path));
if (m_fileHandles.size() >= m_maxFileHandles)
return -EMFILE;
auto handle = VirtualFileSystem::the().open(path, 0, cwdInode());
int error;
auto handle = VirtualFileSystem::the().open(path, error, 0, cwdInode());
if (!handle)
return -ENOENT; // FIXME: Detailed error.
return error;
if (options & O_DIRECTORY && !handle->isDirectory())
return -ENOTDIR; // FIXME: This should be handled by VFS::open.

3
Kernel/init.cpp
View file

@ -131,7 +131,8 @@ static void init_stage2()
#ifdef KSYMS
{
auto handle = vfs->open("/kernel.map");
int error;
auto handle = vfs->open("/kernel.map", error);
if (!handle) {
kprintf("Failed to open /kernel.map\n");
} else {