Skip to content

Commit

Permalink
Kernel: Require semicolon after VERIFY_{NO_,}PROCESS_BIG_LOCK_ACQUIRED
Browse files Browse the repository at this point in the history
This matches out general macro use, and specifically other verification
macros like VERIFY(), VERIFY_NOT_REACHED(), VERIFY_INTERRUPTS_ENABLED(),
and VERIFY_INTERRUPTS_DISABLED().
  • Loading branch information
linusg authored and awesomekling committed Aug 17, 2022
1 parent 0db5f62 commit 146903a
Show file tree
Hide file tree
Showing 43 changed files with 112 additions and 112 deletions.
4 changes: 2 additions & 2 deletions Kernel/Process.h
Original file line number Diff line number Diff line change
Expand Up @@ -1037,10 +1037,10 @@ inline ProcessID Thread::pid() const
}

#define VERIFY_PROCESS_BIG_LOCK_ACQUIRED(process) \
VERIFY(process->big_lock().is_exclusively_locked_by_current_thread());
VERIFY(process->big_lock().is_exclusively_locked_by_current_thread())

#define VERIFY_NO_PROCESS_BIG_LOCK(process) \
VERIFY(!process->big_lock().is_exclusively_locked_by_current_thread());
VERIFY(!process->big_lock().is_exclusively_locked_by_current_thread())

inline static ErrorOr<NonnullOwnPtr<KString>> try_copy_kstring_from_user(Kernel::Syscall::StringArgument const& string)
{
Expand Down
14 changes: 7 additions & 7 deletions Kernel/Syscalls/getuid.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,35 +10,35 @@ namespace Kernel {

ErrorOr<FlatPtr> Process::sys$getuid()
{
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this)
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this);
TRY(require_promise(Pledge::stdio));
return uid().value();
}

ErrorOr<FlatPtr> Process::sys$getgid()
{
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this)
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this);
TRY(require_promise(Pledge::stdio));
return gid().value();
}

ErrorOr<FlatPtr> Process::sys$geteuid()
{
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this)
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this);
TRY(require_promise(Pledge::stdio));
return euid().value();
}

ErrorOr<FlatPtr> Process::sys$getegid()
{
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this)
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this);
TRY(require_promise(Pledge::stdio));
return egid().value();
}

ErrorOr<FlatPtr> Process::sys$getresuid(Userspace<UserID*> ruid, Userspace<UserID*> euid, Userspace<UserID*> suid)
{
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this)
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this);
TRY(require_promise(Pledge::stdio));
TRY(copy_to_user(ruid, &m_protected_values.uid));
TRY(copy_to_user(euid, &m_protected_values.euid));
Expand All @@ -48,7 +48,7 @@ ErrorOr<FlatPtr> Process::sys$getresuid(Userspace<UserID*> ruid, Userspace<UserI

ErrorOr<FlatPtr> Process::sys$getresgid(Userspace<GroupID*> rgid, Userspace<GroupID*> egid, Userspace<GroupID*> sgid)
{
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this)
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this);
TRY(require_promise(Pledge::stdio));
TRY(copy_to_user(rgid, &m_protected_values.gid));
TRY(copy_to_user(egid, &m_protected_values.egid));
Expand All @@ -58,7 +58,7 @@ ErrorOr<FlatPtr> Process::sys$getresgid(Userspace<GroupID*> rgid, Userspace<Grou

ErrorOr<FlatPtr> Process::sys$getgroups(size_t count, Userspace<gid_t*> user_gids)
{
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this)
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this);
TRY(require_promise(Pledge::stdio));
if (!count)
return extra_gids().size();
Expand Down
4 changes: 2 additions & 2 deletions Kernel/Syscalls/hostname.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ namespace Kernel {

ErrorOr<FlatPtr> Process::sys$gethostname(Userspace<char*> buffer, size_t size)
{
VERIFY_NO_PROCESS_BIG_LOCK(this)
VERIFY_NO_PROCESS_BIG_LOCK(this);
TRY(require_promise(Pledge::stdio));
if (size > NumericLimits<ssize_t>::max())
return EINVAL;
Expand All @@ -24,7 +24,7 @@ ErrorOr<FlatPtr> Process::sys$gethostname(Userspace<char*> buffer, size_t size)

ErrorOr<FlatPtr> Process::sys$sethostname(Userspace<char const*> buffer, size_t length)
{
VERIFY_NO_PROCESS_BIG_LOCK(this)
VERIFY_NO_PROCESS_BIG_LOCK(this);
TRY(require_no_promises());

if (!is_superuser())
Expand Down
6 changes: 3 additions & 3 deletions Kernel/Syscalls/inode_watcher.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ namespace Kernel {

ErrorOr<FlatPtr> Process::sys$create_inode_watcher(u32 flags)
{
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this)
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this);
TRY(require_promise(Pledge::rpath));

auto fd_allocation = TRY(allocate_fd());
Expand All @@ -38,7 +38,7 @@ ErrorOr<FlatPtr> Process::sys$create_inode_watcher(u32 flags)

ErrorOr<FlatPtr> Process::sys$inode_watcher_add_watch(Userspace<Syscall::SC_inode_watcher_add_watch_params const*> user_params)
{
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this)
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this);
TRY(require_promise(Pledge::rpath));
auto params = TRY(copy_typed_from_user(user_params));

Expand All @@ -56,7 +56,7 @@ ErrorOr<FlatPtr> Process::sys$inode_watcher_add_watch(Userspace<Syscall::SC_inod

ErrorOr<FlatPtr> Process::sys$inode_watcher_remove_watch(int fd, int wd)
{
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this)
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this);
auto description = TRY(open_file_description(fd));
if (!description->is_inode_watcher())
return EBADF;
Expand Down
2 changes: 1 addition & 1 deletion Kernel/Syscalls/ioctl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace Kernel {

ErrorOr<FlatPtr> Process::sys$ioctl(int fd, unsigned request, FlatPtr arg)
{
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this)
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this);
auto description = TRY(open_file_description(fd));
if (request == FIONBIO) {
description->set_blocking(TRY(copy_typed_from_user(Userspace<int const*>(arg))) == 0);
Expand Down
4 changes: 2 additions & 2 deletions Kernel/Syscalls/kill.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ ErrorOr<void> Process::do_killself(int signal)

ErrorOr<FlatPtr> Process::sys$kill(pid_t pid_or_pgid, int signal)
{
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this)
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this);
if (pid_or_pgid == pid().value())
TRY(require_promise(Pledge::stdio));
else
Expand Down Expand Up @@ -129,7 +129,7 @@ ErrorOr<FlatPtr> Process::sys$kill(pid_t pid_or_pgid, int signal)

ErrorOr<FlatPtr> Process::sys$killpg(pid_t pgrp, int signum)
{
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this)
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this);
TRY(require_promise(Pledge::proc));
if (signum < 1 || signum >= 32)
return EINVAL;
Expand Down
4 changes: 2 additions & 2 deletions Kernel/Syscalls/link.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace Kernel {

ErrorOr<FlatPtr> Process::sys$link(Userspace<Syscall::SC_link_params const*> user_params)
{
VERIFY_NO_PROCESS_BIG_LOCK(this)
VERIFY_NO_PROCESS_BIG_LOCK(this);
TRY(require_promise(Pledge::cpath));
auto params = TRY(copy_typed_from_user(user_params));
auto old_path = TRY(try_copy_kstring_from_user(params.old_path));
Expand All @@ -23,7 +23,7 @@ ErrorOr<FlatPtr> Process::sys$link(Userspace<Syscall::SC_link_params const*> use

ErrorOr<FlatPtr> Process::sys$symlink(Userspace<Syscall::SC_symlink_params const*> user_params)
{
VERIFY_NO_PROCESS_BIG_LOCK(this)
VERIFY_NO_PROCESS_BIG_LOCK(this);
TRY(require_promise(Pledge::cpath));
auto params = TRY(copy_typed_from_user(user_params));

Expand Down
2 changes: 1 addition & 1 deletion Kernel/Syscalls/mkdir.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace Kernel {

ErrorOr<FlatPtr> Process::sys$mkdir(Userspace<char const*> user_path, size_t path_length, mode_t mode)
{
VERIFY_NO_PROCESS_BIG_LOCK(this)
VERIFY_NO_PROCESS_BIG_LOCK(this);
TRY(require_promise(Pledge::cpath));
auto path = TRY(get_syscall_path_argument(user_path, path_length));
TRY(VirtualFileSystem::the().mkdir(path->view(), mode & ~umask(), current_directory()));
Expand Down
2 changes: 1 addition & 1 deletion Kernel/Syscalls/mknod.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace Kernel {

ErrorOr<FlatPtr> Process::sys$mknod(Userspace<Syscall::SC_mknod_params const*> user_params)
{
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this)
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this);
TRY(require_promise(Pledge::dpath));
auto params = TRY(copy_typed_from_user(user_params));

Expand Down
16 changes: 8 additions & 8 deletions Kernel/Syscalls/mmap.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ ErrorOr<void> Process::validate_inode_mmap_prot(int prot, Inode const& inode, bo

ErrorOr<FlatPtr> Process::sys$mmap(Userspace<Syscall::SC_mmap_params const*> user_params)
{
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this)
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this);
TRY(require_promise(Pledge::stdio));
auto params = TRY(copy_typed_from_user(user_params));

Expand Down Expand Up @@ -250,7 +250,7 @@ ErrorOr<FlatPtr> Process::sys$mmap(Userspace<Syscall::SC_mmap_params const*> use

ErrorOr<FlatPtr> Process::sys$mprotect(Userspace<void*> addr, size_t size, int prot)
{
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this)
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this);
TRY(require_promise(Pledge::stdio));

if (prot & PROT_EXEC) {
Expand Down Expand Up @@ -379,7 +379,7 @@ ErrorOr<FlatPtr> Process::sys$mprotect(Userspace<void*> addr, size_t size, int p

ErrorOr<FlatPtr> Process::sys$madvise(Userspace<void*> address, size_t size, int advice)
{
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this)
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this);
TRY(require_promise(Pledge::stdio));

auto range_to_madvise = TRY(Memory::expand_range_to_page_boundaries(address.ptr(), size));
Expand Down Expand Up @@ -410,7 +410,7 @@ ErrorOr<FlatPtr> Process::sys$madvise(Userspace<void*> address, size_t size, int

ErrorOr<FlatPtr> Process::sys$set_mmap_name(Userspace<Syscall::SC_set_mmap_name_params const*> user_params)
{
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this)
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this);
TRY(require_promise(Pledge::stdio));
auto params = TRY(copy_typed_from_user(user_params));

Expand All @@ -434,15 +434,15 @@ ErrorOr<FlatPtr> Process::sys$set_mmap_name(Userspace<Syscall::SC_set_mmap_name_

ErrorOr<FlatPtr> Process::sys$munmap(Userspace<void*> addr, size_t size)
{
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this)
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this);
TRY(require_promise(Pledge::stdio));
TRY(address_space().unmap_mmap_range(addr.vaddr(), size));
return 0;
}

ErrorOr<FlatPtr> Process::sys$mremap(Userspace<Syscall::SC_mremap_params const*> user_params)
{
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this)
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this);
TRY(require_promise(Pledge::stdio));
auto params = TRY(copy_typed_from_user(user_params));

Expand Down Expand Up @@ -478,7 +478,7 @@ ErrorOr<FlatPtr> Process::sys$mremap(Userspace<Syscall::SC_mremap_params const*>

ErrorOr<FlatPtr> Process::sys$allocate_tls(Userspace<char const*> initial_data, size_t size)
{
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this)
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this);
TRY(require_promise(Pledge::stdio));

if (!size || size % PAGE_SIZE != 0)
Expand Down Expand Up @@ -532,7 +532,7 @@ ErrorOr<FlatPtr> Process::sys$allocate_tls(Userspace<char const*> initial_data,

ErrorOr<FlatPtr> Process::sys$msyscall(Userspace<void*> address)
{
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this)
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this);
if (address_space().enforces_syscall_regions())
return EPERM;

Expand Down
4 changes: 2 additions & 2 deletions Kernel/Syscalls/mount.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ static ErrorOr<NonnullRefPtr<FileSystem>> create_filesystem_instance(StringView

ErrorOr<FlatPtr> Process::sys$mount(Userspace<Syscall::SC_mount_params const*> user_params)
{
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this)
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this);
TRY(require_no_promises());
if (!is_superuser())
return EPERM;
Expand Down Expand Up @@ -125,7 +125,7 @@ ErrorOr<FlatPtr> Process::sys$mount(Userspace<Syscall::SC_mount_params const*> u

ErrorOr<FlatPtr> Process::sys$umount(Userspace<char const*> user_mountpoint, size_t mountpoint_length)
{
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this)
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this);
if (!is_superuser())
return EPERM;

Expand Down
4 changes: 2 additions & 2 deletions Kernel/Syscalls/open.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ namespace Kernel {

ErrorOr<FlatPtr> Process::sys$open(Userspace<Syscall::SC_open_params const*> user_params)
{
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this)
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this);
auto params = TRY(copy_typed_from_user(user_params));

int dirfd = params.dirfd;
Expand Down Expand Up @@ -80,7 +80,7 @@ ErrorOr<FlatPtr> Process::sys$open(Userspace<Syscall::SC_open_params const*> use

ErrorOr<FlatPtr> Process::sys$close(int fd)
{
VERIFY_NO_PROCESS_BIG_LOCK(this)
VERIFY_NO_PROCESS_BIG_LOCK(this);
TRY(require_promise(Pledge::stdio));
auto description = TRY(open_file_description(fd));
auto result = description->close();
Expand Down
4 changes: 2 additions & 2 deletions Kernel/Syscalls/perf_event.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace Kernel {

ErrorOr<FlatPtr> Process::sys$perf_event(int type, FlatPtr arg1, FlatPtr arg2)
{
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this)
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this);
auto* events_buffer = current_perf_events_buffer();
if (!events_buffer)
return 0;
Expand All @@ -21,7 +21,7 @@ ErrorOr<FlatPtr> Process::sys$perf_event(int type, FlatPtr arg1, FlatPtr arg2)

ErrorOr<FlatPtr> Process::sys$perf_register_string(Userspace<char const*> user_string, size_t user_string_length)
{
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this)
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this);
auto* events_buffer = current_perf_events_buffer();
if (!events_buffer)
return 0;
Expand Down
2 changes: 1 addition & 1 deletion Kernel/Syscalls/pipe.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace Kernel {

ErrorOr<FlatPtr> Process::sys$pipe(Userspace<int*> pipefd, int flags)
{
VERIFY_NO_PROCESS_BIG_LOCK(this)
VERIFY_NO_PROCESS_BIG_LOCK(this);
TRY(require_promise(Pledge::stdio));

// Reject flags other than O_CLOEXEC, O_NONBLOCK
Expand Down
2 changes: 1 addition & 1 deletion Kernel/Syscalls/pledge.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace Kernel {

ErrorOr<FlatPtr> Process::sys$pledge(Userspace<Syscall::SC_pledge_params const*> user_params)
{
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this)
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this);
auto params = TRY(copy_typed_from_user(user_params));

if (params.promises.length > 1024 || params.execpromises.length > 1024)
Expand Down
2 changes: 1 addition & 1 deletion Kernel/Syscalls/poll.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ using BlockFlags = Thread::FileBlocker::BlockFlags;

ErrorOr<FlatPtr> Process::sys$poll(Userspace<Syscall::SC_poll_params const*> user_params)
{
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this)
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this);
TRY(require_promise(Pledge::stdio));

auto params = TRY(copy_typed_from_user(user_params));
Expand Down
2 changes: 1 addition & 1 deletion Kernel/Syscalls/prctl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace Kernel {

ErrorOr<FlatPtr> Process::sys$prctl(int option, FlatPtr arg1, [[maybe_unused]] FlatPtr arg2)
{
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this)
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this);
switch (option) {
case PR_GET_DUMPABLE:
return is_dumpable();
Expand Down
10 changes: 5 additions & 5 deletions Kernel/Syscalls/process.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@ namespace Kernel {

ErrorOr<FlatPtr> Process::sys$getpid()
{
VERIFY_NO_PROCESS_BIG_LOCK(this)
VERIFY_NO_PROCESS_BIG_LOCK(this);
TRY(require_promise(Pledge::stdio));
return pid().value();
}

ErrorOr<FlatPtr> Process::sys$getppid()
{
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this)
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this);
TRY(require_promise(Pledge::stdio));
return m_protected_values.ppid.value();
}

ErrorOr<FlatPtr> Process::sys$get_process_name(Userspace<char*> buffer, size_t buffer_size)
{
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this)
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this);
TRY(require_promise(Pledge::stdio));
if (m_name->length() + 1 > buffer_size)
return ENAMETOOLONG;
Expand All @@ -36,7 +36,7 @@ ErrorOr<FlatPtr> Process::sys$get_process_name(Userspace<char*> buffer, size_t b

ErrorOr<FlatPtr> Process::sys$set_process_name(Userspace<char const*> user_name, size_t user_name_length)
{
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this)
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this);
TRY(require_promise(Pledge::proc));
if (user_name_length > 256)
return ENAMETOOLONG;
Expand All @@ -50,7 +50,7 @@ ErrorOr<FlatPtr> Process::sys$set_process_name(Userspace<char const*> user_name,

ErrorOr<FlatPtr> Process::sys$set_coredump_metadata(Userspace<Syscall::SC_set_coredump_metadata_params const*> user_params)
{
VERIFY_NO_PROCESS_BIG_LOCK(this)
VERIFY_NO_PROCESS_BIG_LOCK(this);
auto params = TRY(copy_typed_from_user(user_params));

if (params.key.length == 0 || params.key.length > 16 * KiB)
Expand Down
Loading

0 comments on commit 146903a

Please sign in to comment.