diff --git a/Kernel/API/Syscall.h b/Kernel/API/Syscall.h index 00a56a5d20..de3985fe98 100644 --- a/Kernel/API/Syscall.h +++ b/Kernel/API/Syscall.h @@ -104,7 +104,7 @@ enum class NeedsBigProcessLock { S(getresgid, NeedsBigProcessLock::No) \ S(getresuid, NeedsBigProcessLock::No) \ S(getrusage, NeedsBigProcessLock::Yes) \ - S(getsid, NeedsBigProcessLock::Yes) \ + S(getsid, NeedsBigProcessLock::No) \ S(getsockname, NeedsBigProcessLock::Yes) \ S(getsockopt, NeedsBigProcessLock::No) \ S(gettid, NeedsBigProcessLock::No) \ diff --git a/Kernel/Syscalls/setpgid.cpp b/Kernel/Syscalls/setpgid.cpp index 39dc2b4d94..8812f86c92 100644 --- a/Kernel/Syscalls/setpgid.cpp +++ b/Kernel/Syscalls/setpgid.cpp @@ -12,16 +12,17 @@ namespace Kernel { ErrorOr Process::sys$getsid(pid_t pid) { - VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this); + VERIFY_NO_PROCESS_BIG_LOCK(this); TRY(require_promise(Pledge::stdio)); - if (pid == 0) + if (pid == 0 || pid == this->pid()) return sid().value(); - auto process = Process::from_pid_in_same_jail(pid); - if (!process) + auto peer = Process::from_pid_in_same_jail(pid); + if (!peer) return ESRCH; - if (sid() != process->sid()) + auto peer_sid = peer->sid(); + if (sid() != peer_sid) return EPERM; - return process->sid().value(); + return peer_sid.value(); } ErrorOr Process::sys$setsid()