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

Kernel: Pass a parameter struct to symlink()

Browse source
This commit is contained in:
Andreas Kling 2020-01-11 10:31:33 +01:00
parent c97bfbd609
commit 46830a0c32
4 changed files with 23 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Kernel/Process.cpp
View file

@ -2587,14 +2587,19 @@ int Process::sys$unlink(const char* user_path, size_t path_length)
return VFS::the().unlink(path.value(), current_directory());
}
int Process::sys$symlink(const char* target, const char* linkpath)
int Process::sys$symlink(const Syscall::SC_symlink_params* user_params)
{
SmapDisabler disabler;
if (!validate_read_str(target))
if (!validate_read_typed(user_params))
return -EFAULT;
if (!validate_read_str(linkpath))
return -EFAULT;
return VFS::the().symlink(StringView(target), StringView(linkpath), current_directory());
Syscall::SC_symlink_params params;
copy_from_user(&params, user_params);
auto target = get_syscall_path_argument(params.target.characters, params.target.length);
if (target.is_error())
return target.error();
auto linkpath = get_syscall_path_argument(params.linkpath.characters, params.linkpath.length);
if (linkpath.is_error())
return linkpath.error();
return VFS::the().symlink(target.value(), linkpath.value(), current_directory());
}
KResultOr<String> Process::get_syscall_path_argument(const char* user_path, size_t path_length)

2
Kernel/Process.h
View file

@ -177,7 +177,7 @@ public:
int sys$utime(const char* pathname, size_t path_length, const struct utimbuf*);
int sys$link(const Syscall::SC_link_params*);
int sys$unlink(const char* pathname, size_t path_length);
int sys$symlink(const char* target, const char* linkpath);
int sys$symlink(const Syscall::SC_symlink_params*);
int sys$rmdir(const char* pathname, size_t path_length);
int sys$mount(const char* device, const char* mountpoint, const char* fstype);
int sys$umount(const char* mountpoint, size_t mountpoint_length);

5
Kernel/Syscall.h
View file

@ -345,6 +345,11 @@ struct SC_mknod_params {
u32 dev;
};
struct SC_symlink_params {
StringArgument target;
StringArgument linkpath;
};
void initialize();
int sync();

7
Libraries/LibC/unistd.cpp
View file

@ -361,7 +361,12 @@ int unlink(const char* pathname)
int symlink(const char* target, const char* linkpath)
{
int rc = syscall(SC_symlink, target, linkpath);
if (!target || !linkpath) {
errno = EFAULT;
return -1;
}
Syscall::SC_symlink_params params { { target, strlen(target) }, { linkpath, strlen(linkpath) } };
int rc = syscall(SC_symlink, &params);
__RETURN_WITH_ERRNO(rc, rc, -1);
}