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

SystemServer: Do not crash if device files are not present

Browse source
This commit is contained in:
Jean-Baptiste Boric 2021-01-24 20:36:22 +01:00 • committed by Andreas Kling
parent 491a67ddc4
commit 76e12a4840
1 changed files with 17 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

45
Userland/Services/SystemServer/main.cpp
View file

@ -84,6 +84,14 @@ static void parse_boot_mode()
dbgln("Booting in {} mode", g_boot_mode); dbgln("Booting in {} mode", g_boot_mode);
} }
static void chown_wrapper(const char* path, uid_t uid, gid_t gid)
{
int rc = chown(path, uid, gid);
if (rc < 0 && errno != ENOENT) {
ASSERT_NOT_REACHED();
}
}
static void prepare_devfs() static void prepare_devfs()
{ {
// FIXME: Find a better way to all of this stuff, without hardcoding all of this! // FIXME: Find a better way to all of this stuff, without hardcoding all of this!
@ -109,45 +117,26 @@ static void prepare_devfs()
} }
// FIXME: Find a better way to chown without hardcoding the gid! // FIXME: Find a better way to chown without hardcoding the gid!
// This will fail with ENOENT in text mode. chown_wrapper("/dev/fb0", 0, 3);
rc = chown("/dev/fb0", 0, 3);
if (rc < 0 && errno != ENOENT) {
ASSERT_NOT_REACHED();
}
// FIXME: Find a better way to chown without hardcoding the gid! // FIXME: Find a better way to chown without hardcoding the gid!
rc = chown("/dev/keyboard", 0, 3); chown_wrapper("/dev/keyboard", 0, 3);
if (rc < 0) {
ASSERT_NOT_REACHED();
}
// FIXME: Find a better way to chown without hardcoding the gid! // FIXME: Find a better way to chown without hardcoding the gid!
rc = chown("/dev/mouse", 0, 3); chown_wrapper("/dev/mouse", 0, 3);
if (rc < 0) {
ASSERT_NOT_REACHED(); for (size_t index = 0; index < 4; index++) {
// FIXME: Find a better way to chown without hardcoding the gid!
chown_wrapper(String::formatted("/dev/tty{}", index).characters(), 0, 2);
} }
for (size_t index = 0; index < 4; index++) { for (size_t index = 0; index < 4; index++) {
// FIXME: Find a better way to chown without hardcoding the gid! // FIXME: Find a better way to chown without hardcoding the gid!
rc = chown(String::formatted("/dev/tty{}", index).characters(), 0, 2); chown_wrapper(String::formatted("/dev/ttyS{}", index).characters(), 0, 2);
if (rc < 0) {
ASSERT_NOT_REACHED();
}
}
for (size_t index = 0; index < 4; index++) {
// FIXME: Find a better way to chown without hardcoding the gid!
rc = chown(String::formatted("/dev/ttyS{}", index).characters(), 0, 2);
if (rc < 0) {
ASSERT_NOT_REACHED();
}
} }
// FIXME: Find a better way to chown without hardcoding the gid! // FIXME: Find a better way to chown without hardcoding the gid!
rc = chown("/dev/audio", 0, 4); chown_wrapper("/dev/audio", 0, 4);
if (rc < 0) {
ASSERT_NOT_REACHED();
}
rc = symlink("/proc/self/fd/0", "/dev/stdin"); rc = symlink("/proc/self/fd/0", "/dev/stdin");
if (rc < 0) { if (rc < 0) {