From 5331d243c690c70e431e2f8d260eacab19946c2b Mon Sep 17 00:00:00 2001 From: Liav A Date: Fri, 19 Aug 2022 13:29:43 +0300 Subject: [PATCH] Kernel/Syscall: Make anon_create to not use Process::allocate_fd method Instead, allocate when acquiring the lock on m_fds struct, which is safer to do in terms of safely mutating the m_fds struct, because we don't use the big process lock in this syscall. --- Kernel/Syscalls/anon_create.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Kernel/Syscalls/anon_create.cpp b/Kernel/Syscalls/anon_create.cpp index 334e7e9797..c87196b8b5 100644 --- a/Kernel/Syscalls/anon_create.cpp +++ b/Kernel/Syscalls/anon_create.cpp @@ -25,7 +25,6 @@ ErrorOr Process::sys$anon_create(size_t size, int options) if (size > NumericLimits::max()) return EINVAL; - auto new_fd = TRY(allocate_fd()); auto vmobject = TRY(Memory::AnonymousVMObject::try_create_purgeable_with_size(size, AllocationStrategy::AllocateNow)); auto anon_file = TRY(AnonymousFile::try_create(move(vmobject))); auto description = TRY(OpenFileDescription::try_create(move(anon_file))); @@ -37,8 +36,11 @@ ErrorOr Process::sys$anon_create(size_t size, int options) if (options & O_CLOEXEC) fd_flags |= FD_CLOEXEC; - m_fds.with_exclusive([&](auto& fds) { fds[new_fd.fd].set(move(description), fd_flags); }); - return new_fd.fd; + return m_fds.with_exclusive([&](auto& fds) -> ErrorOr { + auto new_fd = TRY(fds.allocate()); + fds[new_fd.fd].set(move(description), fd_flags); + return new_fd.fd; + }); } }