LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-12-26 20:55:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Kernel: Fix panic loop when encountering an unknown boot_mode

Browse Source 
The kernel panic handler now parses the kernels boot_mode to decide how
to handle the panic. So the previous logic could end up in an panic loop
until we blew out the kernel stack.

Instead only validate the kernel's boot mode once per boot, after
initializing the kernel command line.
This commit is contained in:
Brian Gianforcaro 2021-08-08 12:40:45 -07:00 committed by Gunnar Beutner
parent 312946059b
commit 8e93815846
Notes: sideshowbarker 2024-07-18 07:12:25 +09:00 
Author: https://github.com/bgianfo
Commit: https://github.com/SerenityOS/serenity/commit/8e93815846f
Pull-request: https://github.com/SerenityOS/serenity/pull/9293
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Kernel/CommandLine.cpp
View File

@ -38,6 +38,8 @@ UNMAP_AFTER_INIT void CommandLine::initialize()
VERIFY(!s_the);
s_the = new CommandLine(s_cmd_line);
dmesgln("Kernel Commandline: {}", kernel_command_line().string());
// Validate the boot mode the user passed in.
(void)s_the->boot_mode(Validate::Yes);
}
UNMAP_AFTER_INIT void CommandLine::build_commandline(const String& cmdline_from_bootloader)
@ -191,7 +193,7 @@ UNMAP_AFTER_INIT AHCIResetMode CommandLine::ahci_reset_mode() const
PANIC("Unknown AHCIResetMode: {}", ahci_reset_mode);
}
BootMode CommandLine::boot_mode() const
BootMode CommandLine::boot_mode(Validate should_validate) const
{
const auto boot_mode = lookup("boot_mode"sv).value_or("graphical"sv);
if (boot_mode == "no-fbdev"sv) {
@ -201,7 +203,10 @@ BootMode CommandLine::boot_mode() const
} else if (boot_mode == "graphical"sv) {
return BootMode::Graphical;
}
PANIC("Unknown BootMode: {}", boot_mode);
if (should_validate == Validate::Yes)
PANIC("Unknown BootMode: {}", boot_mode);
return BootMode::Unknown;
}
UNMAP_AFTER_INIT bool CommandLine::is_no_framebuffer_devices_mode() const

10
Kernel/CommandLine.h
View File

@ -16,7 +16,8 @@ namespace Kernel {
enum class BootMode {
NoFramebufferDevices,
SelfTest,
Graphical
Graphical,
Unknown,
};
enum class HPETMode {
@ -48,6 +49,11 @@ public:
static void early_initialize(const char* cmd_line);
static void initialize();
enum class Validate {
Yes,
No,
};
[[nodiscard]] const String& string() const { return m_string; }
Optional<String> lookup(const StringView& key) const;
[[nodiscard]] bool contains(const StringView& key) const;
@ -62,7 +68,7 @@ public:
[[nodiscard]] bool is_no_framebuffer_devices_mode() const;
[[nodiscard]] bool is_force_pio() const;
[[nodiscard]] AcpiFeatureLevel acpi_feature_level() const;
[[nodiscard]] BootMode boot_mode() const;
[[nodiscard]] BootMode boot_mode(Validate should_validate = Validate::No) const;
[[nodiscard]] HPETMode hpet_mode() const;
[[nodiscard]] bool disable_physical_storage() const;
[[nodiscard]] bool disable_ps2_controller() const;