RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-10-31 04:12:43 +00:00
Code Issues Activity Actions

Kernel: Pass path+length to the stat() and lstat() syscalls

Browse source 
It's not pleasant having to deal with null-terminated strings as input
to syscalls, so let's get rid of them one by one.
This commit is contained in:
Andreas Kling 2020-01-05 22:02:31 +01:00
parent 152a83fac5
commit f231e9ea76
3 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Kernel/Process.cpp
View file

@ -1499,25 +1499,31 @@ int Process::sys$fstat(int fd, stat* statbuf)
return description->fstat(*statbuf);
}
int Process::sys$lstat(const char* path, stat* statbuf)
int Process::sys$lstat(const char* user_path, size_t path_length, stat* statbuf)
{
if (!validate_write_typed(statbuf))
return -EFAULT;
SmapDisabler disabler;
auto metadata_or_error = VFS::the().lookup_metadata(StringView(path), current_directory(), O_NOFOLLOW_NOERROR);
if (!validate_read(user_path, path_length))
return -EFAULT;
auto path = copy_string_from_user(user_path, path_length);
auto metadata_or_error = VFS::the().lookup_metadata(path, current_directory(), O_NOFOLLOW_NOERROR);
if (metadata_or_error.is_error())
return metadata_or_error.error();
SmapDisabler disabler;
return metadata_or_error.value().stat(*statbuf);
}
int Process::sys$stat(const char* path, stat* statbuf)
int Process::sys$stat(const char* user_path, size_t path_length, stat* statbuf)
{
if (!validate_write_typed(statbuf))
return -EFAULT;
SmapDisabler disabler;
auto metadata_or_error = VFS::the().lookup_metadata(StringView(path), current_directory());
if (!validate_read(user_path, path_length))
return -EFAULT;
auto path = copy_string_from_user(user_path, path_length);
auto metadata_or_error = VFS::the().lookup_metadata(path, current_directory());
if (metadata_or_error.is_error())
return metadata_or_error.error();
SmapDisabler disabler;
return metadata_or_error.value().stat(*statbuf);
}

4
Kernel/Process.h
View file

@ -127,8 +127,8 @@ public:
ssize_t sys$write(int fd, const u8*, ssize_t);
ssize_t sys$writev(int fd, const struct iovec* iov, int iov_count);
int sys$fstat(int fd, stat*);
int sys$lstat(const char*, stat*);
int sys$stat(const char*, stat*);
int sys$lstat(const char*, size_t, stat*);
int sys$stat(const char*, size_t, stat*);
int sys$lseek(int fd, off_t, int whence);
int sys$kill(pid_t pid, int sig);
[[noreturn]] void sys$exit(int status);

4
Libraries/LibC/unistd.cpp
View file

@ -227,13 +227,13 @@ pid_t waitpid(pid_t waitee, int* wstatus, int options)
int lstat(const char* path, struct stat* statbuf)
{
int rc = syscall(SC_lstat, path, statbuf);
int rc = syscall(SC_lstat, path, strlen(path), statbuf);
__RETURN_WITH_ERRNO(rc, rc, -1);
}
int stat(const char* path, struct stat* statbuf)
{
int rc = syscall(SC_stat, path, statbuf);
int rc = syscall(SC_stat, path, strlen(path), statbuf);
__RETURN_WITH_ERRNO(rc, rc, -1);
}