LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-14 01:04:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

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
Notes: sideshowbarker 2024-07-19 11:27:10 +09:00 
Author: https://github.com/sleepy-monax
Commit: https://github.com/SerenityOS/serenity/commit/81c4dcadf14
Pull-request: https://github.com/SerenityOS/serenity/pull/718
Reviewed-by: https://github.com/awesomekling
3 changed files with 14 additions and 1 deletions
Show Stats 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; return *s_the;
} }
bool Console::is_initialized()
{
return s_the != nullptr;
}
Console::Console() Console::Console()
: CharacterDevice(5, 1) : CharacterDevice(5, 1)
{ {

1
Kernel/Console.h
View File

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

9
Kernel/kprintf.cpp
View File

@ -70,7 +70,14 @@ static void console_putch(char*&, char ch)
{ {
if (serial_debug) if (serial_debug)
serial_putch(ch); serial_putch(ch);
Console::the().put_char(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, ...) int kprintf(const char* fmt, ...)