RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-24 21:47:43 +00:00
Code Issues Activity Actions

Kernel: fork()ed children should inherit pledge promises :^)

Browse source 
Update various places that now need wider promises as they are not
reset by fork() anymore.
This commit is contained in:
Andreas Kling 2020-01-11 23:19:30 +01:00
parent b39e732eb3
commit f187374c1b
5 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Applications/Taskbar/main.cpp
View file

@ -5,14 +5,14 @@
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
if (pledge("stdio shared_buffer proc rpath unix cpath fattr", nullptr) < 0) { if (pledge("stdio shared_buffer proc exec rpath unix cpath fattr", nullptr) < 0) {
perror("pledge"); perror("pledge");
return 1; return 1;
} }
GApplication app(argc, argv); GApplication app(argc, argv);
if (pledge("stdio shared_buffer proc rpath unix", nullptr) < 0) { if (pledge("stdio shared_buffer proc exec rpath unix", nullptr) < 0) {
perror("pledge"); perror("pledge");
return 1; return 1;
} }

4
Applications/Terminal/main.cpp
View file

@ -136,7 +136,7 @@ RefPtr<GWindow> create_settings_window(TerminalWidget& terminal, RefPtr<CConfigF
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
if (pledge("stdio tty rpath cpath wpath shared_buffer proc unix fattr", nullptr) < 0) { if (pledge("stdio tty rpath cpath wpath shared_buffer proc exec unix fattr", nullptr) < 0) {
perror("pledge"); perror("pledge");
return 1; return 1;
} }
@ -153,7 +153,7 @@ int main(int argc, char** argv)
GApplication app(argc, argv); GApplication app(argc, argv);
if (pledge("stdio tty rpath cpath wpath shared_buffer proc unix", nullptr) < 0) { if (pledge("stdio tty rpath cpath wpath shared_buffer proc exec unix", nullptr) < 0) {
perror("pledge"); perror("pledge");
return 1; return 1;
} }

2
Kernel/Process.cpp
View file

@ -599,6 +599,8 @@ pid_t Process::sys$fork(RegisterDump& regs)
Thread* child_first_thread = nullptr; Thread* child_first_thread = nullptr;
auto* child = new Process(child_first_thread, m_name, m_uid, m_gid, m_pid, m_ring, m_cwd, m_executable, m_tty, this); auto* child = new Process(child_first_thread, m_name, m_uid, m_gid, m_pid, m_ring, m_cwd, m_executable, m_tty, this);
child->m_root_directory = m_root_directory; child->m_root_directory = m_root_directory;
child->m_promises = m_promises;
child->m_execpromises = m_execpromises;
#ifdef FORK_DEBUG #ifdef FORK_DEBUG
dbgprintf("fork: child=%p\n", child); dbgprintf("fork: child=%p\n", child);

2
Servers/SystemServer/main.cpp
View file

@ -77,7 +77,7 @@ static void mount_all_filesystems()
int main(int, char**) int main(int, char**)
{ {
if (pledge("stdio proc exec unix rpath cpath chown fattr id", nullptr) < 0) { if (pledge("stdio proc exec unix rpath wpath cpath chown fattr id", nullptr) < 0) {
perror("pledge"); perror("pledge");
return 1; return 1;
} }

4
Servers/WindowServer/main.cpp
View file

@ -10,7 +10,7 @@
int main(int, char**) int main(int, char**)
{ {
if (pledge("stdio shared_buffer rpath wpath cpath unix proc fattr", nullptr) < 0) { if (pledge("stdio shared_buffer rpath wpath cpath unix proc exec fattr", nullptr) < 0) {
perror("pledge"); perror("pledge");
return 1; return 1;
} }
@ -35,7 +35,7 @@ int main(int, char**)
WSEventLoop loop; WSEventLoop loop;
if (pledge("stdio shared_buffer rpath wpath cpath unix proc", nullptr) < 0) { if (pledge("stdio shared_buffer rpath wpath cpath unix proc exec", nullptr) < 0) {
perror("pledge"); perror("pledge");
return 1; return 1;
} }