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

Don't unblock a blocked process when it ignores a signal.

Browse source
This commit is contained in:
Andreas Kling 2018-11-16 21:14:25 +01:00
parent a788e85c09
commit 6cedb88153
3 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Kernel/Process.cpp
View file

@ -745,7 +745,7 @@ bool Process::has_unmasked_pending_signals() const
return m_pending_signals & m_signal_mask; return m_pending_signals & m_signal_mask;
} }
void Process::dispatch_one_pending_signal() bool Process::dispatch_one_pending_signal()
{ {
ASSERT_INTERRUPTS_DISABLED(); ASSERT_INTERRUPTS_DISABLED();
dword signal_candidates = m_pending_signals & m_signal_mask; dword signal_candidates = m_pending_signals & m_signal_mask;
@ -757,10 +757,10 @@ void Process::dispatch_one_pending_signal()
break; break;
} }
} }
dispatch_signal(signal); return dispatch_signal(signal);
} }
void Process::dispatch_signal(byte signal) bool Process::dispatch_signal(byte signal)
{ {
ASSERT_INTERRUPTS_DISABLED(); ASSERT_INTERRUPTS_DISABLED();
ASSERT(signal < 32); ASSERT(signal < 32);
@ -774,12 +774,14 @@ void Process::dispatch_signal(byte signal)
auto handler_laddr = action.handler_or_sigaction; auto handler_laddr = action.handler_or_sigaction;
if (handler_laddr.is_null()) { if (handler_laddr.is_null()) {
// FIXME: Is termination really always the appropriate action? // FIXME: Is termination really always the appropriate action?
return terminate_due_to_signal(signal); terminate_due_to_signal(signal);
return true;
} }
m_pending_signals &= ~(1 << signal);
if (handler_laddr.asPtr() == SIG_IGN) { if (handler_laddr.asPtr() == SIG_IGN) {
dbgprintf("%s(%u) ignored signal %u\n", name().characters(), pid(), signal); dbgprintf("%s(%u) ignored signal %u\n", name().characters(), pid(), signal); return false;
return;
} }
Scheduler::prepare_to_modify_tss(*this); Scheduler::prepare_to_modify_tss(*this);
@ -871,14 +873,13 @@ void Process::dispatch_signal(byte signal)
else else
push_value_on_stack(m_return_to_ring3_from_signal_trampoline.get()); push_value_on_stack(m_return_to_ring3_from_signal_trampoline.get());
m_pending_signals &= ~(1 << signal);
// FIXME: This state is such a hack. It avoids trouble if 'current' is the process receiving a signal. // FIXME: This state is such a hack. It avoids trouble if 'current' is the process receiving a signal.
set_state(Skip1SchedulerPass); set_state(Skip1SchedulerPass);
#ifdef SIGNAL_DEBUG #ifdef SIGNAL_DEBUG
dbgprintf("signal: Okay, %s(%u) {%s} has been primed with signal handler %w:%x\n", name().characters(), pid(), toString(state()), m_tss.cs, m_tss.eip); dbgprintf("signal: Okay, %s(%u) {%s} has been primed with signal handler %w:%x\n", name().characters(), pid(), toString(state()), m_tss.cs, m_tss.eip);
#endif #endif
return true;
} }
void Process::sys$sigreturn() void Process::sys$sigreturn()

4
Kernel/Process.h
View file

@ -208,8 +208,8 @@ public:
size_t max_open_file_descriptors() const { return m_max_open_file_descriptors; } size_t max_open_file_descriptors() const { return m_max_open_file_descriptors; }
void send_signal(byte signal, Process* sender); void send_signal(byte signal, Process* sender);
void dispatch_one_pending_signal(); bool dispatch_one_pending_signal();
void dispatch_signal(byte signal); bool dispatch_signal(byte signal);
bool has_unmasked_pending_signals() const; bool has_unmasked_pending_signals() const;
void terminate_due_to_signal(byte signal); void terminate_due_to_signal(byte signal);

3
Kernel/Scheduler.cpp
View file

@ -96,7 +96,8 @@ bool Scheduler::pick_next()
// syscall effectively being "interrupted" despite having completed? // syscall effectively being "interrupted" despite having completed?
if (process.in_kernel() && !process.is_blocked()) if (process.in_kernel() && !process.is_blocked())
return true; return true;
process.dispatch_one_pending_signal(); if (!process.dispatch_one_pending_signal())
return true;
if (process.is_blocked()) { if (process.is_blocked()) {
process.m_was_interrupted_while_blocked = true; process.m_was_interrupted_while_blocked = true;
process.unblock(); process.unblock();