Bananymous
/
banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LibC: Rewrite sigprocmask in terms of pthread_sigmask 

Also don't fail SYS_SIGPROCMASK if how is invalid and set is NULL.
This commit is contained in:
Bananymous 2024-08-07 17:01:35 +03:00
parent 2ca7886f88
commit 7afdfb150f
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
kernel/kernel/Process.cpp
View File

@ -1826,16 +1826,6 @@ namespace Kernel
BAN::ErrorOr<long> Process::sys_sigprocmask(int how, const sigset_t* set, sigset_t* oset) BAN::ErrorOr<long> Process::sys_sigprocmask(int how, const sigset_t* set, sigset_t* oset)
{ {
switch (how)
{
case SIG_BLOCK:
case SIG_SETMASK:
case SIG_UNBLOCK:
break;
default:
return BAN::Error::from_errno(EINVAL);
}
LockGuard _(m_process_lock); LockGuard _(m_process_lock);
if (set) if (set)
TRY(validate_pointer_access(set, sizeof(sigset_t))); TRY(validate_pointer_access(set, sizeof(sigset_t)));
@ -1857,8 +1847,10 @@ namespace Kernel
Thread::current().m_signal_block_mask = mask; Thread::current().m_signal_block_mask = mask;
break; break;
case SIG_UNBLOCK: case SIG_UNBLOCK:
Thread::current().m_signal_block_mask &= mask; Thread::current().m_signal_block_mask &= ~mask;
break; break;
default:
return BAN::Error::from_errno(EINVAL);
} }
} }

7
userspace/libraries/LibC/signal.cpp
View File

@ -19,6 +19,11 @@ void psignal(int signum, const char* message)
fprintf(stderr, "%s\n", strsignal(signum)); fprintf(stderr, "%s\n", strsignal(signum));
} }
int pthread_sigmask(int how, const sigset_t* __restrict set, sigset_t* __restrict oset)
{
return syscall(SYS_SIGPROCMASK, how, set, oset);
}
int raise(int sig) int raise(int sig)
{ {
// FIXME: won't work after multithreaded // FIXME: won't work after multithreaded
@ -72,5 +77,5 @@ int sigpending(sigset_t* set)
int sigprocmask(int how, const sigset_t* __restrict set, sigset_t* __restrict oset) int sigprocmask(int how, const sigset_t* __restrict set, sigset_t* __restrict oset)
{ {
return syscall(SYS_SIGPROCMASK, how, set, oset); return pthread_sigmask(how, set, oset);
} }