RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-28 00:15:07 +00:00
Code Issues Activity Actions

Kernel: Prevent kprintf() from asserting in Console::the() (#718)

Browse source 
This triggered a stack overflow because ubsan can call kprintf() at any
time, even before Console is initialized.
This commit is contained in:
Nicolas Van Bossuyt 2019-11-03 13:17:55 +01:00 • committed by Andreas Kling
parent 8216019b2e
commit 81c4dcadf1
3 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Kernel/Console.cpp
View file

@ -13,6 +13,11 @@ Console& Console::the()
return *s_the;
}
bool Console::is_initialized()
{
return s_the != nullptr;
}
Console::Console()
: CharacterDevice(5, 1)
{

1
Kernel/Console.h
View file

@ -14,6 +14,7 @@ class Console final : public CharacterDevice {
AK_MAKE_ETERNAL
public:
static Console& the();
static bool is_initialized();
Console();
virtual ~Console() override;

7
Kernel/kprintf.cpp
View file

@ -70,7 +70,14 @@ static void console_putch(char*&, char ch)
{
if (serial_debug)
serial_putch(ch);
// It would be bad to reach the assert in Console()::the() and do a stack overflow
if (Console::is_initialized()) {
Console::the().put_char(ch);
} else {
IO::out8(0xe9, ch);
}
}
int kprintf(const char* fmt, ...)