system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-10-05 23:50:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Kernel: Pass a parameter struct to mknod()

Browse source
This commit is contained in:
Andreas Kling 2020-01-11 10:27:37 +01:00
parent 6536a80aa9
commit c97bfbd609
5 changed files with 35 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Kernel/Process.cpp
View file

@ -3667,17 +3667,18 @@ void Process::FileDescriptionAndFlags::set(NonnullRefPtr<FileDescription>&& d, u
flags = f;
}
int Process::sys$mknod(const char* pathname, mode_t mode, dev_t dev)
int Process::sys$mknod(const Syscall::SC_mknod_params* user_params)
{
if (!validate_read_str(pathname))
if (!validate_read_typed(user_params))
return -EFAULT;
if (!is_superuser()) {
if (!is_regular_file(mode) && !is_fifo(mode) && !is_socket(mode))
return -EPERM;
}
return VFS::the().mknod(StringView(pathname), mode & ~umask(), dev, current_directory());
Syscall::SC_mknod_params params;
copy_from_user(&params, user_params);
if (!is_superuser() && !is_regular_file(params.mode) && !is_fifo(params.mode) && !is_socket(params.mode))
return -EPERM;
auto path = get_syscall_path_argument(params.path.characters, params.path.length);
if (path.is_error())
return path.error();
return VFS::the().mknod(path.value(), params.mode & ~umask(), params.dev, current_directory());
}
int Process::sys$dump_backtrace()

2
Kernel/Process.h
View file

@ -206,7 +206,7 @@ public:
int sys$get_thread_name(int tid, char* buffer, int buffer_size);
int sys$rename(const char* oldpath, const char* newpath);
int sys$systrace(pid_t);
int sys$mknod(const char* pathname, mode_t, dev_t);
int sys$mknod(const Syscall::SC_mknod_params*);
int sys$create_shared_buffer(int, void** buffer);
int sys$share_buffer_with(int, pid_t peer_pid);
int sys$share_buffer_globally(int);

12
Kernel/StdLib.h
View file

@ -36,3 +36,15 @@ void* memmove(void* dest, const void* src, size_t n);
inline u16 ntohs(u16 w) { return (w & 0xff) << 8 | ((w >> 8) & 0xff); }
inline u16 htons(u16 w) { return (w & 0xff) << 8 | ((w >> 8) & 0xff); }
}
template<typename T>
inline void copy_from_user(T* dest, const T* src)
{
copy_from_user(dest, src, sizeof(T));
}
template<typename T>
inline void copy_to_user(T* dest, const T* src)
{
copy_to_user(dest, src, sizeof(T));
}

6
Kernel/Syscall.h
View file

@ -339,6 +339,12 @@ struct SC_chown_params {
u32 gid;
};
struct SC_mknod_params {
StringArgument path;
u16 mode;
u32 dev;
};
void initialize();
int sync();

7
Libraries/LibC/unistd.cpp
View file

@ -451,7 +451,12 @@ int access(const char* pathname, int mode)
int mknod(const char* pathname, mode_t mode, dev_t dev)
{
int rc = syscall(SC_mknod, pathname, mode, dev);
if (!pathname) {
errno = EFAULT;
return -1;
}
Syscall::SC_mknod_params params { { pathname, strlen(pathname) }, mode, dev };
int rc = syscall(SC_mknod, &params);
__RETURN_WITH_ERRNO(rc, rc, -1);
}