RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 08:47:34 +00:00
Code Issues Activity Actions

Kernel/Syscall: Make anon_create to not use Process::allocate_fd method

Browse source 
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.
This commit is contained in:
Liav A 2022-08-19 13:29:43 +03:00 • committed by Linus Groh
parent 0eaee045cf
commit 5331d243c6
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Kernel/Syscalls/anon_create.cpp
View file

@ -25,7 +25,6 @@ ErrorOr<FlatPtr> Process::sys$anon_create(size_t size, int options)
if (size > NumericLimits<ssize_t>::max()) if (size > NumericLimits<ssize_t>::max())
return EINVAL; return EINVAL;
auto new_fd = TRY(allocate_fd());
auto vmobject = TRY(Memory::AnonymousVMObject::try_create_purgeable_with_size(size, AllocationStrategy::AllocateNow)); auto vmobject = TRY(Memory::AnonymousVMObject::try_create_purgeable_with_size(size, AllocationStrategy::AllocateNow));
auto anon_file = TRY(AnonymousFile::try_create(move(vmobject))); auto anon_file = TRY(AnonymousFile::try_create(move(vmobject)));
auto description = TRY(OpenFileDescription::try_create(move(anon_file))); auto description = TRY(OpenFileDescription::try_create(move(anon_file)));
@ -37,8 +36,11 @@ ErrorOr<FlatPtr> Process::sys$anon_create(size_t size, int options)
if (options & O_CLOEXEC) if (options & O_CLOEXEC)
fd_flags |= FD_CLOEXEC; fd_flags |= FD_CLOEXEC;
m_fds.with_exclusive([&](auto& fds) { fds[new_fd.fd].set(move(description), fd_flags); }); return m_fds.with_exclusive([&](auto& fds) -> ErrorOr<FlatPtr> {
return new_fd.fd; auto new_fd = TRY(fds.allocate());
fds[new_fd.fd].set(move(description), fd_flags);
return new_fd.fd;
});
} }
} }