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

Kernel: PID/PGID typing

Browse source 
This compiles, and fixes two bugs:
- setpgid() confusion (see previous commit)
- tcsetpgrp() now allows to set a non-empty process group even if
  the group leader has already died. This makes Serenity slightly
  more POSIX-compatible.
This commit is contained in:
Ben Wiederhake 2020-08-08 22:04:20 +02:00 • committed by Andreas Kling
parent f5744a6f2f
commit 7bdf54c837
7 changed files with 53 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Kernel/TTY/TTY.cpp
View file

@ -159,6 +159,7 @@ void TTY::emit(u8 ch)
if (auto parent = Process::from_pid(m_process->ppid()))
(void)parent->send_signal(SIGCHLD, m_process);
}
// TODO: Else send it to the session leader maybe?
return;
}
}
@ -253,7 +254,7 @@ void TTY::generate_signal(int signal)
return;
if (should_flush_on_signal())
flush_input();
dbg() << tty_name() << ": Send signal " << signal << " to everyone in pgrp " << pgid();
dbg() << tty_name() << ": Send signal " << signal << " to everyone in pgrp " << pgid().value();
InterruptDisabler disabler; // FIXME: Iterate over a set of process handles instead?
Process::for_each_in_pgrp(pgid(), [&](auto& process) {
dbg() << tty_name() << ": Send signal " << signal << " to " << process;
@ -291,7 +292,6 @@ int TTY::ioctl(FileDescription&, unsigned request, FlatPtr arg)
{
REQUIRE_PROMISE(tty);
auto& current_process = *Process::current();
pid_t pgid;
termios* user_termios;
winsize* user_winsize;
@ -304,23 +304,21 @@ int TTY::ioctl(FileDescription&, unsigned request, FlatPtr arg)
#endif
switch (request) {
case TIOCGPGRP:
return this->pgid();
case TIOCSPGRP:
pgid = static_cast<pid_t>(arg);
return this->pgid().value();
case TIOCSPGRP: {
ProcessGroupID pgid = static_cast<pid_t>(arg);
if (pgid <= 0)
return -EINVAL;
{
InterruptDisabler disabler;
auto process = Process::from_pid(pgid);
if (!process)
return -EPERM;
if (pgid != process->pgid())
return -EPERM;
if (current_process.sid() != process->sid())
return -EPERM;
m_process = process->make_weak_ptr();
}
InterruptDisabler disabler;
auto process = Process::from_pid(pgid.value());
SessionID new_sid = process ? process->sid() : Process::get_sid_from_pgid(pgid);
if (!new_sid || new_sid != current_process.sid())
return -EPERM;
if (process && pgid != process->pgid())
return -EPERM;
m_process = process ? process->make_weak_ptr() : WeakPtr<Process>();
return 0;
}
case TCGETS: {
user_termios = reinterpret_cast<termios*>(arg);
if (!current_process.validate_write(user_termios, sizeof(termios)))
@ -395,7 +393,7 @@ void TTY::hang_up()
generate_signal(SIGHUP);
}
pid_t TTY::pgid() const
ProcessGroupID TTY::pgid() const
{
return m_process ? m_process->pgid() : 0;
}