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

Kernel: Make O_RDONLY non-zero

Browse source 
Sergey suggested that having a non-zero O_RDONLY would make some things
less confusing, and it seems like he's right about that.

We can now easily check read/write permissions separately instead of
dancing around with the bits.

This patch also fixes unveil() validation for O_RDWR which previously
forgot to check for "r" permission.
This commit is contained in:
Andreas Kling 2020-01-21 13:14:26 +01:00
parent efbd1620d9
commit 6081c76515
6 changed files with 24 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Kernel/FileSystem/FileDescription.h
View file

@ -59,16 +59,8 @@ public:
void set_rw_mode(int options) void set_rw_mode(int options)
{ {
if (options & O_WRONLY) { set_readable(options & O_RDONLY);
set_readable(false); set_writable(options & O_WRONLY);
set_writable(true);
} else if (options & O_RDWR) {
set_readable(true);
set_writable(true);
} else {
set_readable(true);
set_writable(false);
}
} }
int close(); int close();

27
Kernel/FileSystem/VirtualFileSystem.cpp
View file

@ -239,13 +239,10 @@ KResultOr<NonnullRefPtr<FileDescription>> VFS::open(StringView path, int options
bool should_truncate_file = false; bool should_truncate_file = false;
// NOTE: Read permission is a bit weird, since O_RDONLY == 0, if ((options & O_RDONLY) && !metadata.may_read(current->process()))
// so we check if (NOT write_only OR read_and_write) return KResult(-EACCES);
if (!(options & O_WRONLY) || (options & O_RDWR)) {
if (!metadata.may_read(current->process())) if (options & O_WRONLY) {
return KResult(-EACCES);
}
if ((options & O_WRONLY) || (options & O_RDWR)) {
if (!metadata.may_write(current->process())) if (!metadata.may_write(current->process()))
return KResult(-EACCES); return KResult(-EACCES);
if (metadata.is_directory()) if (metadata.is_directory())
@ -748,21 +745,23 @@ KResult VFS::validate_path_against_process_veil(StringView path, int options)
} }
return KSuccess; return KSuccess;
} }
if ((options & O_RDWR) || (options & O_WRONLY)) { if (options & O_RDONLY) {
if (!(unveiled_path->permissions & UnveiledPath::Access::Read)) {
dbg() << *current << " rejecting path '" << path << "' since it hasn't been unveiled with 'r' permission.";
return KResult(-EACCES);
}
}
if (options & O_WRONLY) {
if (!(unveiled_path->permissions & UnveiledPath::Access::Write)) { if (!(unveiled_path->permissions & UnveiledPath::Access::Write)) {
dbg() << *current << " rejecting path '" << path << "' since it hasn't been unveiled with 'w' permission."; dbg() << *current << " rejecting path '" << path << "' since it hasn't been unveiled with 'w' permission.";
return KResult(-EACCES); return KResult(-EACCES);
} }
} else if (options & O_EXEC) { }
if (options & O_EXEC) {
if (!(unveiled_path->permissions & UnveiledPath::Access::Execute)) { if (!(unveiled_path->permissions & UnveiledPath::Access::Execute)) {
dbg() << *current << " rejecting path '" << path << "' since it hasn't been unveiled with 'x' permission."; dbg() << *current << " rejecting path '" << path << "' since it hasn't been unveiled with 'x' permission.";
return KResult(-EACCES); return KResult(-EACCES);
} }
} else {
if (!(unveiled_path->permissions & UnveiledPath::Access::Read)) {
dbg() << *current << " rejecting path '" << path << "' since it hasn't been unveiled with 'r' permission.";
return KResult(-EACCES);
}
} }
return KSuccess; return KSuccess;
} }

6
Kernel/FileSystem/VirtualFileSystem.h
View file

@ -38,9 +38,9 @@
#include <Kernel/FileSystem/InodeMetadata.h> #include <Kernel/FileSystem/InodeMetadata.h>
#include <Kernel/KResult.h> #include <Kernel/KResult.h>
#define O_RDONLY 0 #define O_RDONLY 1
#define O_WRONLY 1 #define O_WRONLY 2
#define O_RDWR 2 #define O_RDWR 3
#define O_EXEC 4 #define O_EXEC 4
#define O_CREAT 0100 #define O_CREAT 0100
#define O_EXCL 0200 #define O_EXCL 0200

2
Kernel/Net/LocalSocket.cpp
View file

@ -111,7 +111,7 @@ KResult LocalSocket::bind(const sockaddr* user_address, socklen_t address_size)
mode_t mode = S_IFSOCK | (m_prebind_mode & 04777); mode_t mode = S_IFSOCK | (m_prebind_mode & 04777);
UidAndGid owner { m_prebind_uid, m_prebind_gid }; UidAndGid owner { m_prebind_uid, m_prebind_gid };
auto result = VFS::the().open(path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW_NOERROR, mode, current->process().current_directory(), owner); auto result = VFS::the().open(path, O_CREAT | O_EXCL | O_NOFOLLOW_NOERROR, mode, current->process().current_directory(), owner);
if (result.is_error()) { if (result.is_error()) {
if (result.error() == -EEXIST) if (result.error() == -EEXIST)
return KResult(-EADDRINUSE); return KResult(-EADDRINUSE);

4
Kernel/Process.cpp
View file

@ -1945,9 +1945,9 @@ int Process::sys$open(const Syscall::SC_open_params* user_params)
if (options & O_UNLINK_INTERNAL) if (options & O_UNLINK_INTERNAL)
return -EINVAL; return -EINVAL;
if ((options & O_RDWR) || (options & O_WRONLY)) if (options & O_WRONLY)
REQUIRE_PROMISE(wpath); REQUIRE_PROMISE(wpath);
else else if (options & O_RDONLY)
REQUIRE_PROMISE(rpath); REQUIRE_PROMISE(rpath);
if (options & O_CREAT) if (options & O_CREAT)

6
Libraries/LibC/fcntl.h
View file

@ -39,9 +39,9 @@ __BEGIN_DECLS
#define FD_CLOEXEC 1 #define FD_CLOEXEC 1
#define O_RDONLY 0 #define O_RDONLY 1
#define O_WRONLY 1 #define O_WRONLY 2
#define O_RDWR 2 #define O_RDWR 3
#define O_ACCMODE 3 #define O_ACCMODE 3
#define O_EXEC 4 #define O_EXEC 4
#define O_CREAT 0100 #define O_CREAT 0100