From c5890afc8bf6008535c633f8aacccc7a9d6b38af Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Sun, 5 Jan 2020 22:06:25 +0100 Subject: [PATCH] Kernel: Make chdir() take path+length --- Kernel/Process.cpp | 7 ++++--- Kernel/Process.h | 2 +- Libraries/LibC/unistd.cpp | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Kernel/Process.cpp b/Kernel/Process.cpp index b89b22e95c..1b1d0ecac9 100644 --- a/Kernel/Process.cpp +++ b/Kernel/Process.cpp @@ -1555,12 +1555,13 @@ int Process::sys$readlink(const char* path, char* buffer, ssize_t size) return 0; } -int Process::sys$chdir(const char* path) +int Process::sys$chdir(const char* user_path, size_t path_length) { SmapDisabler disabler; - if (!validate_read_str(path)) + if (!validate_read(user_path, path_length)) return -EFAULT; - auto directory_or_error = VFS::the().open_directory(StringView(path), current_directory()); + auto path = copy_string_from_user(user_path, path_length); + auto directory_or_error = VFS::the().open_directory(path, current_directory()); if (directory_or_error.is_error()) return directory_or_error.error(); m_cwd = *directory_or_error.value(); diff --git a/Kernel/Process.h b/Kernel/Process.h index 063134be2a..001f1c0c8c 100644 --- a/Kernel/Process.h +++ b/Kernel/Process.h @@ -144,7 +144,7 @@ public: int sys$poll(pollfd*, int nfds, int timeout); ssize_t sys$get_dir_entries(int fd, void*, ssize_t); int sys$getcwd(char*, ssize_t); - int sys$chdir(const char*); + int sys$chdir(const char*, size_t); int sys$fchdir(int fd); int sys$sleep(unsigned seconds); int sys$usleep(useconds_t usec); diff --git a/Libraries/LibC/unistd.cpp b/Libraries/LibC/unistd.cpp index c15413db04..e1cfde0463 100644 --- a/Libraries/LibC/unistd.cpp +++ b/Libraries/LibC/unistd.cpp @@ -245,7 +245,7 @@ int fstat(int fd, struct stat* statbuf) int chdir(const char* path) { - int rc = syscall(SC_chdir, path); + int rc = syscall(SC_chdir, path, strlen(path)); __RETURN_WITH_ERRNO(rc, rc, -1); }