gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: differences in behavior of sigaction between Linux and Mckernel

Browse Source
This commit is contained in:
Ken Sato
2018-03-01 09:44:44 +09:00
parent 7ad6f9595c
commit 140f813d77
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/x86_64/kernel/include/signal.h
View File

@@ -18,6 +18,11 @@
#define _NSIG_BPW 64 #define _NSIG_BPW 64
#define _NSIG_WORDS (_NSIG / _NSIG_BPW) #define _NSIG_WORDS (_NSIG / _NSIG_BPW)
static inline int valid_signal(unsigned long sig)
{
return sig <= _NSIG ? 1 : 0;
}
typedef unsigned long int __sigset_t; typedef unsigned long int __sigset_t;
#define __sigmask(sig) (((__sigset_t) 1) << ((sig) - 1)) #define __sigmask(sig) (((__sigset_t) 1) << ((sig) - 1))

2
arch/x86_64/kernel/syscall.c
View File

@@ -143,8 +143,6 @@ SYSCALL_DECLARE(rt_sigaction)
struct k_sigaction new_sa, old_sa; struct k_sigaction new_sa, old_sa;
int rc; int rc;
if(sig == SIGKILL || sig == SIGSTOP || sig <= 0 || sig > 64)
return -EINVAL;
if (sigsetsize != sizeof(sigset_t)) if (sigsetsize != sizeof(sigset_t))
return -EINVAL; return -EINVAL;

7
kernel/syscall.c
View File

@@ -3059,6 +3059,13 @@ do_sigaction(int sig, struct k_sigaction *act, struct k_sigaction *oact)
struct mcs_rwlock_node_irqsave mcs_rw_node; struct mcs_rwlock_node_irqsave mcs_rw_node;
ihk_mc_user_context_t ctx0; ihk_mc_user_context_t ctx0;
if (!valid_signal(sig) || sig < 1) {
return -EINVAL;
}
if (act && (sig == SIGKILL || sig == SIGSTOP)) {
return -EINVAL;
}
mcs_rwlock_writer_lock(&thread->sigcommon->lock, &mcs_rw_node); mcs_rwlock_writer_lock(&thread->sigcommon->lock, &mcs_rw_node);
k = thread->sigcommon->action + sig - 1; k = thread->sigcommon->action + sig - 1;
if(oact) if(oact)