system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-10-04 15:09:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

AK+Kernel: Don't allow allocations in AK::Function in kernel mode

Browse source 
Refs #6369.
Fixes #15053.

Co-authored-by: Brian Gianforcaro <bgianf@serenityos.org>
This commit is contained in:
Gunnar Beutner 2022-11-01 09:28:44 +01:00 committed by Linus Groh
parent 2a840a538c
commit e44ccddba3
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
AK/Function.h
View file

@ -213,13 +213,18 @@ private:
{ {
VERIFY(m_call_nesting_level == 0); VERIFY(m_call_nesting_level == 0);
using WrapperType = CallableWrapper<Callable>; using WrapperType = CallableWrapper<Callable>;
#ifndef KERNEL
if constexpr (sizeof(WrapperType) > inline_capacity) { if constexpr (sizeof(WrapperType) > inline_capacity) {
*bit_cast<CallableWrapperBase**>(&m_storage) = new WrapperType(forward<Callable>(callable)); *bit_cast<CallableWrapperBase**>(&m_storage) = new WrapperType(forward<Callable>(callable));
m_kind = FunctionKind::Outline; m_kind = FunctionKind::Outline;
} else { } else {
#endif
static_assert(sizeof(WrapperType) <= inline_capacity);
new (m_storage) WrapperType(forward<Callable>(callable)); new (m_storage) WrapperType(forward<Callable>(callable));
m_kind = FunctionKind::Inline; m_kind = FunctionKind::Inline;
#ifndef KERNEL
} }
#endif
} }
void move_from(Function&& other) void move_from(Function&& other)
@ -246,8 +251,13 @@ private:
FunctionKind m_kind { FunctionKind::NullPointer }; FunctionKind m_kind { FunctionKind::NullPointer };
bool m_deferred_clear { false }; bool m_deferred_clear { false };
mutable Atomic<u16> m_call_nesting_level { 0 }; mutable Atomic<u16> m_call_nesting_level { 0 };
#ifndef KERNEL
// Empirically determined to fit most lambdas and functions. // Empirically determined to fit most lambdas and functions.
static constexpr size_t inline_capacity = 4 * sizeof(void*); static constexpr size_t inline_capacity = 4 * sizeof(void*);
#else
// FIXME: Try to decrease this.
static constexpr size_t inline_capacity = 6 * sizeof(void*);
#endif
alignas(max(alignof(CallableWrapperBase), alignof(CallableWrapperBase*))) u8 m_storage[inline_capacity]; alignas(max(alignof(CallableWrapperBase), alignof(CallableWrapperBase*))) u8 m_storage[inline_capacity];
}; };