diff options
| -rw-r--r-- | arch/arm/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/include/asm/signal.h | 7 | ||||
| -rw-r--r-- | arch/arm/kernel/signal.c | 32 |
3 files changed, 1 insertions, 39 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 614c49716ae7..db3152d6dd88 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -58,6 +58,7 @@ config ARM | |||
| 58 | select CLONE_BACKWARDS | 58 | select CLONE_BACKWARDS |
| 59 | select GENERIC_SIGALTSTACK | 59 | select GENERIC_SIGALTSTACK |
| 60 | select OLD_SIGSUSPEND3 | 60 | select OLD_SIGSUSPEND3 |
| 61 | select OLD_SIGACTION | ||
| 61 | help | 62 | help |
| 62 | The ARM series is a line of low-power-consumption RISC chip designs | 63 | The ARM series is a line of low-power-consumption RISC chip designs |
| 63 | licensed by ARM Ltd and targeted at embedded applications and | 64 | licensed by ARM Ltd and targeted at embedded applications and |
diff --git a/arch/arm/include/asm/signal.h b/arch/arm/include/asm/signal.h index a5076b9bd463..c0eb412aff04 100644 --- a/arch/arm/include/asm/signal.h +++ b/arch/arm/include/asm/signal.h | |||
| @@ -16,13 +16,6 @@ typedef struct { | |||
| 16 | unsigned long sig[_NSIG_WORDS]; | 16 | unsigned long sig[_NSIG_WORDS]; |
| 17 | } sigset_t; | 17 | } sigset_t; |
| 18 | 18 | ||
| 19 | struct old_sigaction { | ||
| 20 | __sighandler_t sa_handler; | ||
| 21 | old_sigset_t sa_mask; | ||
| 22 | unsigned long sa_flags; | ||
| 23 | __sigrestore_t sa_restorer; | ||
| 24 | }; | ||
| 25 | |||
| 26 | #define __ARCH_HAS_SA_RESTORER | 19 | #define __ARCH_HAS_SA_RESTORER |
| 27 | 20 | ||
| 28 | #include <asm/sigcontext.h> | 21 | #include <asm/sigcontext.h> |
diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c index 61b2cfcef3f1..07429a23c720 100644 --- a/arch/arm/kernel/signal.c +++ b/arch/arm/kernel/signal.c | |||
| @@ -45,38 +45,6 @@ const unsigned long sigreturn_codes[7] = { | |||
| 45 | MOV_R7_NR_RT_SIGRETURN, SWI_SYS_RT_SIGRETURN, SWI_THUMB_RT_SIGRETURN, | 45 | MOV_R7_NR_RT_SIGRETURN, SWI_SYS_RT_SIGRETURN, SWI_THUMB_RT_SIGRETURN, |
| 46 | }; | 46 | }; |
| 47 | 47 | ||
| 48 | asmlinkage int | ||
| 49 | sys_sigaction(int sig, const struct old_sigaction __user *act, | ||
| 50 | struct old_sigaction __user *oact) | ||
| 51 | { | ||
| 52 | struct k_sigaction new_ka, old_ka; | ||
| 53 | int ret; | ||
| 54 | |||
| 55 | if (act) { | ||
| 56 | old_sigset_t mask; | ||
| 57 | if (!access_ok(VERIFY_READ, act, sizeof(*act)) || | ||
| 58 | __get_user(new_ka.sa.sa_handler, &act->sa_handler) || | ||
| 59 | __get_user(new_ka.sa.sa_restorer, &act->sa_restorer) || | ||
| 60 | __get_user(new_ka.sa.sa_flags, &act->sa_flags) || | ||
| 61 | __get_user(mask, &act->sa_mask)) | ||
| 62 | return -EFAULT; | ||
| 63 | siginitset(&new_ka.sa.sa_mask, mask); | ||
| 64 | } | ||
| 65 | |||
| 66 | ret = do_sigaction(sig, act ? &new_ka : NULL, oact ? &old_ka : NULL); | ||
| 67 | |||
| 68 | if (!ret && oact) { | ||
| 69 | if (!access_ok(VERIFY_WRITE, oact, sizeof(*oact)) || | ||
| 70 | __put_user(old_ka.sa.sa_handler, &oact->sa_handler) || | ||
| 71 | __put_user(old_ka.sa.sa_restorer, &oact->sa_restorer) || | ||
| 72 | __put_user(old_ka.sa.sa_flags, &oact->sa_flags) || | ||
| 73 | __put_user(old_ka.sa.sa_mask.sig[0], &oact->sa_mask)) | ||
| 74 | return -EFAULT; | ||
| 75 | } | ||
| 76 | |||
| 77 | return ret; | ||
| 78 | } | ||
| 79 | |||
| 80 | #ifdef CONFIG_CRUNCH | 48 | #ifdef CONFIG_CRUNCH |
| 81 | static int preserve_crunch_context(struct crunch_sigframe __user *frame) | 49 | static int preserve_crunch_context(struct crunch_sigframe __user *frame) |
| 82 | { | 50 | { |
