* [PATCH 35/44] m68k: Use translate_signal()
@ 2014-03-03 0:00 Richard Weinberger
2014-03-03 0:00 ` [PATCH 36/44] microblaze: " Richard Weinberger
` (8 more replies)
0 siblings, 9 replies; 10+ messages in thread
From: Richard Weinberger @ 2014-03-03 0:00 UTC (permalink / raw)
To: linux-kernel
Cc: linux-arch, viro, vgupta, catalin.marinas, will.deacon,
hskinnemoen, egtvedt, vapier, msalter, a-jacquiot, starvik,
jesper.nilsson, dhowells, rkuo, tony.luck, fenghua.yu, takata,
geert, james.hogan, monstr, yasutake.koichi, ralf, jonas, jejb,
deller, benh, paulus, schwidefsky, heiko.carstens, liqin.linux,
lennox.wu, cmetcalf, gxt, linux-xtensa, akpm, oleg, tj, hch,
Richard Weinberger
Use the common helper instead of it's own open coded variant.
Signed-off-by: Richard Weinberger <richard@nod.at>
---
arch/m68k/kernel/signal.c | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a/arch/m68k/kernel/signal.c b/arch/m68k/kernel/signal.c
index c8e6fa8..b8a428b 100644
--- a/arch/m68k/kernel/signal.c
+++ b/arch/m68k/kernel/signal.c
@@ -39,7 +39,6 @@
#include <linux/unistd.h>
#include <linux/stddef.h>
#include <linux/highuid.h>
-#include <linux/personality.h>
#include <linux/tty.h>
#include <linux/binfmts.h>
#include <linux/module.h>
@@ -871,12 +870,7 @@ static int setup_frame(struct ksignal *ksig, sigset_t *set,
if (fsize)
err |= copy_to_user (frame + 1, regs + 1, fsize);
- err |= __put_user((current_thread_info()->exec_domain
- && current_thread_info()->exec_domain->signal_invmap
- && sig < 32
- ? current_thread_info()->exec_domain->signal_invmap[sig]
- : sig),
- &frame->sig);
+ err |= __put_user(translate_signal(sig), &frame->sig);
err |= __put_user(regs->vector, &frame->code);
err |= __put_user(&frame->sc, &frame->psc);
@@ -956,12 +950,7 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
if (fsize)
err |= copy_to_user (&frame->uc.uc_extra, regs + 1, fsize);
- err |= __put_user((current_thread_info()->exec_domain
- && current_thread_info()->exec_domain->signal_invmap
- && sig < 32
- ? current_thread_info()->exec_domain->signal_invmap[sig]
- : sig),
- &frame->sig);
+ err |= __put_user(translate_signal(sig), &frame->sig);
err |= __put_user(&frame->info, &frame->pinfo);
err |= __put_user(&frame->uc, &frame->puc);
err |= copy_siginfo_to_user(&frame->info, &ksig->info);
--
1.8.4.2
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 36/44] microblaze: Use translate_signal()
2014-03-03 0:00 [PATCH 35/44] m68k: Use translate_signal() Richard Weinberger
@ 2014-03-03 0:00 ` Richard Weinberger
2014-03-03 0:00 ` [PATCH 37/44] mn10300: " Richard Weinberger
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Richard Weinberger @ 2014-03-03 0:00 UTC (permalink / raw)
To: linux-kernel
Cc: linux-arch, viro, vgupta, catalin.marinas, will.deacon,
hskinnemoen, egtvedt, vapier, msalter, a-jacquiot, starvik,
jesper.nilsson, dhowells, rkuo, tony.luck, fenghua.yu, takata,
geert, james.hogan, monstr, yasutake.koichi, ralf, jonas, jejb,
deller, benh, paulus, schwidefsky, heiko.carstens, liqin.linux,
lennox.wu, cmetcalf, gxt, linux-xtensa, akpm, oleg, tj, hch,
Richard Weinberger
Use the common helper instead of it's own open coded variant.
Signed-off-by: Richard Weinberger <richard@nod.at>
---
arch/microblaze/kernel/signal.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/arch/microblaze/kernel/signal.c b/arch/microblaze/kernel/signal.c
index a34da52..7bde506 100644
--- a/arch/microblaze/kernel/signal.c
+++ b/arch/microblaze/kernel/signal.c
@@ -28,7 +28,6 @@
#include <linux/ptrace.h>
#include <linux/unistd.h>
#include <linux/stddef.h>
-#include <linux/personality.h>
#include <linux/percpu.h>
#include <linux/linkage.h>
#include <linux/tracehook.h>
@@ -160,8 +159,7 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
struct pt_regs *regs)
{
struct rt_sigframe __user *frame;
- int err = 0, sig = ksig->sig;
- int signal;
+ int err = 0, signal;
unsigned long address = 0;
#ifdef CONFIG_MMU
pmd_t *pmdp;
@@ -173,11 +171,7 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
return -EFAULT;
- signal = current_thread_info()->exec_domain
- && current_thread_info()->exec_domain->signal_invmap
- && sig < 32
- ? current_thread_info()->exec_domain->signal_invmap[sig]
- : sig;
+ signal = translate_signal(ksig->sig);
if (ksig->ka.sa.sa_flags & SA_SIGINFO)
err |= copy_siginfo_to_user(&frame->info, &ksig->info);
--
1.8.4.2
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 37/44] mn10300: Use translate_signal()
2014-03-03 0:00 [PATCH 35/44] m68k: Use translate_signal() Richard Weinberger
2014-03-03 0:00 ` [PATCH 36/44] microblaze: " Richard Weinberger
@ 2014-03-03 0:00 ` Richard Weinberger
2014-03-03 0:00 ` [PATCH 38/44] s390: " Richard Weinberger
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Richard Weinberger @ 2014-03-03 0:00 UTC (permalink / raw)
To: linux-kernel
Cc: linux-arch, viro, vgupta, catalin.marinas, will.deacon,
hskinnemoen, egtvedt, vapier, msalter, a-jacquiot, starvik,
jesper.nilsson, dhowells, rkuo, tony.luck, fenghua.yu, takata,
geert, james.hogan, monstr, yasutake.koichi, ralf, jonas, jejb,
deller, benh, paulus, schwidefsky, heiko.carstens, liqin.linux,
lennox.wu, cmetcalf, gxt, linux-xtensa, akpm, oleg, tj, hch,
Richard Weinberger
Use the common helper instead of it's own open coded variant.
Signed-off-by: Richard Weinberger <richard@nod.at>
---
arch/mn10300/kernel/signal.c | 27 ++++++---------------------
1 file changed, 6 insertions(+), 21 deletions(-)
diff --git a/arch/mn10300/kernel/signal.c b/arch/mn10300/kernel/signal.c
index 0c97202..de75354 100644
--- a/arch/mn10300/kernel/signal.c
+++ b/arch/mn10300/kernel/signal.c
@@ -20,7 +20,6 @@
#include <linux/unistd.h>
#include <linux/stddef.h>
#include <linux/tty.h>
-#include <linux/personality.h>
#include <linux/suspend.h>
#include <linux/tracehook.h>
#include <asm/cacheflush.h>
@@ -211,20 +210,13 @@ static int setup_frame(struct ksignal *ksig, sigset_t *set,
struct pt_regs *regs)
{
struct sigframe __user *frame;
- int rsig, sig = ksig->sig;
frame = get_sigframe(&ksig->ka, regs, sizeof(*frame));
if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
return -EFAULT;
- rsig = sig;
- if (sig < 32 &&
- current_thread_info()->exec_domain &&
- current_thread_info()->exec_domain->signal_invmap)
- rsig = current_thread_info()->exec_domain->signal_invmap[sig];
-
- if (__put_user(rsig, &frame->sig) < 0 ||
+ if (__put_user(translate_signal(ksig->sig), &frame->sig) < 0 ||
__put_user(&frame->sc, &frame->psc) < 0)
return -EFAULT;
@@ -260,12 +252,12 @@ static int setup_frame(struct ksignal *ksig, sigset_t *set,
/* set up registers for signal handler */
regs->sp = (unsigned long) frame;
regs->pc = (unsigned long) ksig->ka.sa.sa_handler;
- regs->d0 = sig;
+ regs->d0 = ksig->sig;
regs->d1 = (unsigned long) &frame->sc;
#if DEBUG_SIG
printk(KERN_DEBUG "SIG deliver %d (%s:%d): sp=%p pc=%lx ra=%p\n",
- sig, current->comm, current->pid, frame, regs->pc,
+ ksig->sig, current->comm, current->pid, frame, regs->pc,
frame->pretcode);
#endif
@@ -279,20 +271,13 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
struct pt_regs *regs)
{
struct rt_sigframe __user *frame;
- int rsig, sig = ksig->sig;
frame = get_sigframe(&ksig->ka, regs, sizeof(*frame));
if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
return -EFAULT;
- rsig = sig;
- if (sig < 32 &&
- current_thread_info()->exec_domain &&
- current_thread_info()->exec_domain->signal_invmap)
- rsig = current_thread_info()->exec_domain->signal_invmap[sig];
-
- if (__put_user(rsig, &frame->sig) ||
+ if (__put_user(translate_signal(ksig->sig), &frame->sig) ||
__put_user(&frame->info, &frame->pinfo) ||
__put_user(&frame->uc, &frame->puc) ||
copy_siginfo_to_user(&frame->info, &ksig->info))
@@ -332,12 +317,12 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
/* Set up registers for signal handler */
regs->sp = (unsigned long) frame;
regs->pc = (unsigned long) ksig->ka.sa.sa_handler;
- regs->d0 = sig;
+ regs->d0 = ksig->sig;
regs->d1 = (long) &frame->info;
#if DEBUG_SIG
printk(KERN_DEBUG "SIG deliver %d (%s:%d): sp=%p pc=%lx ra=%p\n",
- sig, current->comm, current->pid, frame, regs->pc,
+ ksig->sig, current->comm, current->pid, frame, regs->pc,
frame->pretcode);
#endif
--
1.8.4.2
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 38/44] s390: Use translate_signal()
2014-03-03 0:00 [PATCH 35/44] m68k: Use translate_signal() Richard Weinberger
2014-03-03 0:00 ` [PATCH 36/44] microblaze: " Richard Weinberger
2014-03-03 0:00 ` [PATCH 37/44] mn10300: " Richard Weinberger
@ 2014-03-03 0:00 ` Richard Weinberger
2014-03-03 0:00 ` [PATCH 39/44] sh: " Richard Weinberger
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Richard Weinberger @ 2014-03-03 0:00 UTC (permalink / raw)
To: linux-kernel
Cc: linux-arch, viro, vgupta, catalin.marinas, will.deacon,
hskinnemoen, egtvedt, vapier, msalter, a-jacquiot, starvik,
jesper.nilsson, dhowells, rkuo, tony.luck, fenghua.yu, takata,
geert, james.hogan, monstr, yasutake.koichi, ralf, jonas, jejb,
deller, benh, paulus, schwidefsky, heiko.carstens, liqin.linux,
lennox.wu, cmetcalf, gxt, linux-xtensa, akpm, oleg, tj, hch,
Richard Weinberger
Use the common helper instead of it's own variant.
Signed-off-by: Richard Weinberger <richard@nod.at>
---
arch/s390/kernel/compat_signal.c | 15 ++-------------
arch/s390/kernel/signal.c | 15 ++-------------
2 files changed, 4 insertions(+), 26 deletions(-)
diff --git a/arch/s390/kernel/compat_signal.c b/arch/s390/kernel/compat_signal.c
index f6c6140..0ac6be5 100644
--- a/arch/s390/kernel/compat_signal.c
+++ b/arch/s390/kernel/compat_signal.c
@@ -20,7 +20,6 @@
#include <linux/unistd.h>
#include <linux/stddef.h>
#include <linux/tty.h>
-#include <linux/personality.h>
#include <linux/binfmts.h>
#include <asm/ucontext.h>
#include <asm/uaccess.h>
@@ -310,16 +309,6 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs * regs, size_t frame_size)
return (void __user *)((sp - frame_size) & -8ul);
}
-static inline int map_signal(int sig)
-{
- if (current_thread_info()->exec_domain
- && current_thread_info()->exec_domain->signal_invmap
- && sig < 32)
- return current_thread_info()->exec_domain->signal_invmap[sig];
- else
- return sig;
-}
-
static int setup_frame32(struct ksignal *ksig, sigset_t *set,
struct pt_regs *regs)
{
@@ -362,7 +351,7 @@ static int setup_frame32(struct ksignal *ksig, sigset_t *set,
(regs->psw.mask & ~PSW_MASK_ASC);
regs->psw.addr = (__force __u64) ksig->ka.sa.sa_handler;
- regs->gprs[2] = map_signal(sig);
+ regs->gprs[2] = translate_signal(sig);
regs->gprs[3] = (__force __u64) &frame->sc;
/* We forgot to include these in the sigcontext.
@@ -426,7 +415,7 @@ static int setup_rt_frame32(struct ksignal *ksig, sigset_t *set,
(regs->psw.mask & ~PSW_MASK_ASC);
regs->psw.addr = (__u64 __force) ksig->ka.sa.sa_handler;
- regs->gprs[2] = map_signal(ksig->sig);
+ regs->gprs[2] = translate_signal(ksig->sig);
regs->gprs[3] = (__force __u64) &frame->info;
regs->gprs[4] = (__force __u64) &frame->uc;
regs->gprs[5] = task_thread_info(current)->last_break;
diff --git a/arch/s390/kernel/signal.c b/arch/s390/kernel/signal.c
index 0e420a1..d63272b 100644
--- a/arch/s390/kernel/signal.c
+++ b/arch/s390/kernel/signal.c
@@ -20,7 +20,6 @@
#include <linux/unistd.h>
#include <linux/stddef.h>
#include <linux/tty.h>
-#include <linux/personality.h>
#include <linux/binfmts.h>
#include <linux/tracehook.h>
#include <linux/syscalls.h>
@@ -182,16 +181,6 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs * regs, size_t frame_size)
return (void __user *)((sp - frame_size) & -8ul);
}
-static inline int map_signal(int sig)
-{
- if (current_thread_info()->exec_domain
- && current_thread_info()->exec_domain->signal_invmap
- && sig < 32)
- return current_thread_info()->exec_domain->signal_invmap[sig];
- else
- return sig;
-}
-
static int setup_frame(int sig, struct k_sigaction *ka,
sigset_t *set, struct pt_regs * regs)
{
@@ -235,7 +224,7 @@ static int setup_frame(int sig, struct k_sigaction *ka,
(regs->psw.mask & ~PSW_MASK_ASC);
regs->psw.addr = (unsigned long) ka->sa.sa_handler | PSW_ADDR_AMODE;
- regs->gprs[2] = map_signal(sig);
+ regs->gprs[2] = translate_signal(sig);
regs->gprs[3] = (unsigned long) &frame->sc;
/* We forgot to include these in the sigcontext.
@@ -302,7 +291,7 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
(regs->psw.mask & ~PSW_MASK_ASC);
regs->psw.addr = (unsigned long) ksig->ka.sa.sa_handler | PSW_ADDR_AMODE;
- regs->gprs[2] = map_signal(ksig->sig);
+ regs->gprs[2] = translate_signal(ksig->sig);
regs->gprs[3] = (unsigned long) &frame->info;
regs->gprs[4] = (unsigned long) &frame->uc;
regs->gprs[5] = task_thread_info(current)->last_break;
--
1.8.4.2
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 39/44] sh: Use translate_signal()
2014-03-03 0:00 [PATCH 35/44] m68k: Use translate_signal() Richard Weinberger
` (2 preceding siblings ...)
2014-03-03 0:00 ` [PATCH 38/44] s390: " Richard Weinberger
@ 2014-03-03 0:00 ` Richard Weinberger
2014-03-03 0:00 ` [PATCH 40/44] tile: " Richard Weinberger
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Richard Weinberger @ 2014-03-03 0:00 UTC (permalink / raw)
To: linux-kernel
Cc: linux-arch, viro, vgupta, catalin.marinas, will.deacon,
hskinnemoen, egtvedt, vapier, msalter, a-jacquiot, starvik,
jesper.nilsson, dhowells, rkuo, tony.luck, fenghua.yu, takata,
geert, james.hogan, monstr, yasutake.koichi, ralf, jonas, jejb,
deller, benh, paulus, schwidefsky, heiko.carstens, liqin.linux,
lennox.wu, cmetcalf, gxt, linux-xtensa, akpm, oleg, tj, hch,
Richard Weinberger
Use the common helper instead of it's own open coded variant.
Signed-off-by: Richard Weinberger <richard@nod.at>
---
arch/sh/kernel/signal_32.c | 23 ++++-------------------
arch/sh/kernel/signal_64.c | 19 ++++---------------
2 files changed, 8 insertions(+), 34 deletions(-)
diff --git a/arch/sh/kernel/signal_32.c b/arch/sh/kernel/signal_32.c
index 2ee67c5..9fe811b 100644
--- a/arch/sh/kernel/signal_32.c
+++ b/arch/sh/kernel/signal_32.c
@@ -20,7 +20,6 @@
#include <linux/stddef.h>
#include <linux/tty.h>
#include <linux/elf.h>
-#include <linux/personality.h>
#include <linux/binfmts.h>
#include <linux/io.h>
#include <linux/tracehook.h>
@@ -270,20 +269,13 @@ static int setup_frame(struct ksignal *ksig, sigset_t *set,
struct pt_regs *regs)
{
struct sigframe __user *frame;
- int err = 0, sig = ksig->sig;
- int signal;
+ int err = 0;
frame = get_sigframe(&ksig->ka, regs->regs[15], sizeof(*frame));
if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
return -EFAULT;
- signal = current_thread_info()->exec_domain
- && current_thread_info()->exec_domain->signal_invmap
- && sig < 32
- ? current_thread_info()->exec_domain->signal_invmap[sig]
- : sig;
-
err |= setup_sigcontext(&frame->sc, regs, set->sig[0]);
if (_NSIG_WORDS > 1)
@@ -317,7 +309,7 @@ static int setup_frame(struct ksignal *ksig, sigset_t *set,
/* Set up registers for signal handler */
regs->regs[15] = (unsigned long) frame;
- regs->regs[4] = signal; /* Arg for signal handler */
+ regs->regs[4] = translate_signal(ksig->sig); /* Arg for signal handler */
regs->regs[5] = 0;
regs->regs[6] = (unsigned long) &frame->sc;
@@ -345,20 +337,13 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
struct pt_regs *regs)
{
struct rt_sigframe __user *frame;
- int err = 0, sig = ksig->sig;
- int signal;
+ int err = 0;
frame = get_sigframe(&ksig->ka, regs->regs[15], sizeof(*frame));
if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
return -EFAULT;
- signal = current_thread_info()->exec_domain
- && current_thread_info()->exec_domain->signal_invmap
- && sig < 32
- ? current_thread_info()->exec_domain->signal_invmap[sig]
- : sig;
-
err |= copy_siginfo_to_user(&frame->info, &ksig->info);
/* Create the ucontext. */
@@ -396,7 +381,7 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
/* Set up registers for signal handler */
regs->regs[15] = (unsigned long) frame;
- regs->regs[4] = signal; /* Arg for signal handler */
+ regs->regs[4] = translate_signal(ksig->sig); /* Arg for signal handler */
regs->regs[5] = (unsigned long) &frame->info;
regs->regs[6] = (unsigned long) &frame->uc;
diff --git a/arch/sh/kernel/signal_64.c b/arch/sh/kernel/signal_64.c
index 897abe7..693f450 100644
--- a/arch/sh/kernel/signal_64.c
+++ b/arch/sh/kernel/signal_64.c
@@ -17,7 +17,6 @@
#include <linux/signal.h>
#include <linux/errno.h>
#include <linux/wait.h>
-#include <linux/personality.h>
#include <linux/ptrace.h>
#include <linux/unistd.h>
#include <linux/stddef.h>
@@ -377,19 +376,14 @@ void sa_default_rt_restorer(void); /* See comments below */
static int setup_frame(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs)
{
struct sigframe __user *frame;
- int err = 0, sig = ksig->sig;
- int signal;
+ int err = 0, signal;
frame = get_sigframe(&ksig->ka, regs->regs[REG_SP], sizeof(*frame));
if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
return -EFAULT;
- signal = current_thread_info()->exec_domain
- && current_thread_info()->exec_domain->signal_invmap
- && sig < 32
- ? current_thread_info()->exec_domain->signal_invmap[sig]
- : sig;
+ signal = translate_signal(ksig->sig);
err |= setup_sigcontext(&frame->sc, regs, set->sig[0]);
@@ -472,19 +466,14 @@ static int setup_rt_frame(struct ksignal *kig, sigset_t *set,
struct pt_regs *regs)
{
struct rt_sigframe __user *frame;
- int err = 0, sig = ksig->sig;
- int signal;
+ int err = 0, signal;
frame = get_sigframe(&ksig->ka, regs->regs[REG_SP], sizeof(*frame));
if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
return -EFAULT;
- signal = current_thread_info()->exec_domain
- && current_thread_info()->exec_domain->signal_invmap
- && sig < 32
- ? current_thread_info()->exec_domain->signal_invmap[sig]
- : sig;
+ signal = translate_signal(ksig->sig);
err |= __put_user(&frame->info, &frame->pinfo);
err |= __put_user(&frame->uc, &frame->puc);
--
1.8.4.2
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 40/44] tile: Use translate_signal()
2014-03-03 0:00 [PATCH 35/44] m68k: Use translate_signal() Richard Weinberger
` (3 preceding siblings ...)
2014-03-03 0:00 ` [PATCH 39/44] sh: " Richard Weinberger
@ 2014-03-03 0:00 ` Richard Weinberger
2014-03-03 0:00 ` [PATCH 41/44] unicore32: " Richard Weinberger
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Richard Weinberger @ 2014-03-03 0:00 UTC (permalink / raw)
To: linux-kernel
Cc: linux-arch, viro, vgupta, catalin.marinas, will.deacon,
hskinnemoen, egtvedt, vapier, msalter, a-jacquiot, starvik,
jesper.nilsson, dhowells, rkuo, tony.luck, fenghua.yu, takata,
geert, james.hogan, monstr, yasutake.koichi, ralf, jonas, jejb,
deller, benh, paulus, schwidefsky, heiko.carstens, liqin.linux,
lennox.wu, cmetcalf, gxt, linux-xtensa, akpm, oleg, tj, hch,
Richard Weinberger
Use the common helper instead of it's own open coded variant.
Signed-off-by: Richard Weinberger <richard@nod.at>
---
arch/tile/kernel/compat_signal.c | 12 ++----------
arch/tile/kernel/signal.c | 12 ++----------
2 files changed, 4 insertions(+), 20 deletions(-)
diff --git a/arch/tile/kernel/compat_signal.c b/arch/tile/kernel/compat_signal.c
index 8c5abf2..b14e5e9 100644
--- a/arch/tile/kernel/compat_signal.c
+++ b/arch/tile/kernel/compat_signal.c
@@ -21,7 +21,6 @@
#include <linux/wait.h>
#include <linux/unistd.h>
#include <linux/stddef.h>
-#include <linux/personality.h>
#include <linux/suspend.h>
#include <linux/ptrace.h>
#include <linux/elf.h>
@@ -195,20 +194,13 @@ int compat_setup_rt_frame(struct ksignal *ksig, sigset_t *set,
{
unsigned long restorer;
struct compat_rt_sigframe __user *frame;
- int err = 0, sig = ksig->sig;
- int usig;
+ int err = 0;
frame = compat_get_sigframe(&ksig->ka, regs, sizeof(*frame));
if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
goto err;
- usig = current_thread_info()->exec_domain
- && current_thread_info()->exec_domain->signal_invmap
- && sig < 32
- ? current_thread_info()->exec_domain->signal_invmap[sig]
- : sig;
-
/* Always write at least the signal number for the stack backtracer. */
if (ksig->ka.sa.sa_flags & SA_SIGINFO) {
/* At sigreturn time, restore the callee-save registers too. */
@@ -243,7 +235,7 @@ int compat_setup_rt_frame(struct ksignal *ksig, sigset_t *set,
regs->ex1 = PL_ICS_EX1(USER_PL, 1); /* set crit sec in handler */
regs->sp = ptr_to_compat_reg(frame);
regs->lr = restorer;
- regs->regs[0] = (unsigned long) usig;
+ regs->regs[0] = (unsigned long) translate_signal(ksig->sig);
regs->regs[1] = ptr_to_compat_reg(&frame->info);
regs->regs[2] = ptr_to_compat_reg(&frame->uc);
regs->flags |= PT_FLAGS_CALLER_SAVES;
diff --git a/arch/tile/kernel/signal.c b/arch/tile/kernel/signal.c
index 27aba86..5837ccf 100644
--- a/arch/tile/kernel/signal.c
+++ b/arch/tile/kernel/signal.c
@@ -22,7 +22,6 @@
#include <linux/wait.h>
#include <linux/unistd.h>
#include <linux/stddef.h>
-#include <linux/personality.h>
#include <linux/suspend.h>
#include <linux/ptrace.h>
#include <linux/elf.h>
@@ -158,20 +157,13 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
{
unsigned long restorer;
struct rt_sigframe __user *frame;
- int err = 0, sig = ksig->sig;
- int usig;
+ int err = 0;
frame = get_sigframe(&ksig->ka, regs, sizeof(*frame));
if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
goto err;
- usig = current_thread_info()->exec_domain
- && current_thread_info()->exec_domain->signal_invmap
- && sig < 32
- ? current_thread_info()->exec_domain->signal_invmap[sig]
- : sig;
-
/* Always write at least the signal number for the stack backtracer. */
if (ksig->ka.sa.sa_flags & SA_SIGINFO) {
/* At sigreturn time, restore the callee-save registers too. */
@@ -206,7 +198,7 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
regs->ex1 = PL_ICS_EX1(USER_PL, 1); /* set crit sec in handler */
regs->sp = (unsigned long) frame;
regs->lr = restorer;
- regs->regs[0] = (unsigned long) usig;
+ regs->regs[0] = (unsigned long) translate_signal(ksig->sig);
regs->regs[1] = (unsigned long) &frame->info;
regs->regs[2] = (unsigned long) &frame->uc;
regs->flags |= PT_FLAGS_CALLER_SAVES;
--
1.8.4.2
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 41/44] unicore32: Use translate_signal()
2014-03-03 0:00 [PATCH 35/44] m68k: Use translate_signal() Richard Weinberger
` (4 preceding siblings ...)
2014-03-03 0:00 ` [PATCH 40/44] tile: " Richard Weinberger
@ 2014-03-03 0:00 ` Richard Weinberger
2014-03-03 0:00 ` [PATCH 42/44] x86: " Richard Weinberger
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Richard Weinberger @ 2014-03-03 0:00 UTC (permalink / raw)
To: linux-kernel
Cc: linux-arch, viro, vgupta, catalin.marinas, will.deacon,
hskinnemoen, egtvedt, vapier, msalter, a-jacquiot, starvik,
jesper.nilsson, dhowells, rkuo, tony.luck, fenghua.yu, takata,
geert, james.hogan, monstr, yasutake.koichi, ralf, jonas, jejb,
deller, benh, paulus, schwidefsky, heiko.carstens, liqin.linux,
lennox.wu, cmetcalf, gxt, linux-xtensa, akpm, oleg, tj, hch,
Richard Weinberger
Use the common helper instead of it's own open coded variant.
Signed-off-by: Richard Weinberger <richard@nod.at>
---
arch/unicore32/kernel/signal.c | 31 ++++++++-----------------------
1 file changed, 8 insertions(+), 23 deletions(-)
diff --git a/arch/unicore32/kernel/signal.c b/arch/unicore32/kernel/signal.c
index 780d773..7b48572 100644
--- a/arch/unicore32/kernel/signal.c
+++ b/arch/unicore32/kernel/signal.c
@@ -11,7 +11,6 @@
*/
#include <linux/errno.h>
#include <linux/signal.h>
-#include <linux/personality.h>
#include <linux/uaccess.h>
#include <linux/tracehook.h>
#include <linux/elf.h>
@@ -211,13 +210,9 @@ static inline void __user *get_sigframe(struct k_sigaction *ka,
return frame;
}
-static int setup_return(struct pt_regs *regs, struct k_sigaction *ka,
- unsigned long __user *rc, void __user *frame, int usig)
+static int setup_return(struct ksignal *ksig, struct pt_regs *regs,
+ unsigned long __user *rc, void __user *frame)
{
- unsigned long handler = (unsigned long)ka->sa.sa_handler;
- unsigned long retcode;
- unsigned long asr = regs->UCreg_asr & ~PSR_f;
-
unsigned int idx = 0;
if (ka->sa.sa_flags & SA_SIGINFO)
@@ -227,13 +222,11 @@ static int setup_return(struct pt_regs *regs, struct k_sigaction *ka,
__put_user(sigreturn_codes[idx+1], rc+1))
return 1;
- retcode = KERN_SIGRETURN_CODE + (idx << 2);
-
- regs->UCreg_00 = usig;
+ regs->UCreg_00 = translate_signal(ksig->sig);
regs->UCreg_sp = (unsigned long)frame;
- regs->UCreg_lr = retcode;
- regs->UCreg_pc = handler;
- regs->UCreg_asr = asr;
+ regs->UCreg_lr = KERN_SIGRETURN_CODE + (idx << 2);
+ regs->UCreg_pc = (unsigned long)ksig->ka.sa.sa_handler;
+ regs->UCreg_asr = regs->UCreg_asr & ~PSR_f;
return 0;
}
@@ -254,7 +247,7 @@ static int setup_frame(struct ksignal *ksig, sigset_t *set,
err |= setup_sigframe(frame, regs, set);
if (err == 0)
- err |= setup_return(regs, &ksig->ka, frame->retcode, frame, usig);
+ err |= setup_return(ksig, regs, frame->retcode, frame);
return err;
}
@@ -276,7 +269,7 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
err |= __save_altstack(&frame->sig.uc.uc_stack, regs->UCreg_sp);
err |= setup_sigframe(&frame->sig, regs, set);
if (err == 0)
- err |= setup_return(regs, &ksig->ka, frame->sig.retcode, frame, usig);
+ err |= setup_return(ksig, regs, frame->sig.retcode, frame);
if (err == 0) {
/*
@@ -305,7 +298,6 @@ static void handle_signal(struct ksignal *ksig, struct pt_regs *regs,
struct thread_info *thread = current_thread_info();
struct task_struct *tsk = current;
sigset_t *oldset = sigmask_to_save();
- int usig = ksig->sig;
int ret;
/*
@@ -329,13 +321,6 @@ static void handle_signal(struct ksignal *ksig, struct pt_regs *regs,
}
/*
- * translate the signal
- */
- if (usig < 32 && thread->exec_domain
- && thread->exec_domain->signal_invmap)
- usig = thread->exec_domain->signal_invmap[usig];
-
- /*
* Set up the stack frame
*/
if (ksig->ka.sa.sa_flags & SA_SIGINFO)
--
1.8.4.2
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 42/44] x86: Use translate_signal()
2014-03-03 0:00 [PATCH 35/44] m68k: Use translate_signal() Richard Weinberger
` (5 preceding siblings ...)
2014-03-03 0:00 ` [PATCH 41/44] unicore32: " Richard Weinberger
@ 2014-03-03 0:00 ` Richard Weinberger
2014-03-03 0:00 ` [PATCH 43/44] um/x86: " Richard Weinberger
2014-03-03 0:00 ` [PATCH 44/44] xtensa: " Richard Weinberger
8 siblings, 0 replies; 10+ messages in thread
From: Richard Weinberger @ 2014-03-03 0:00 UTC (permalink / raw)
To: linux-kernel
Cc: linux-arch, viro, vgupta, catalin.marinas, will.deacon,
hskinnemoen, egtvedt, vapier, msalter, a-jacquiot, starvik,
jesper.nilsson, dhowells, rkuo, tony.luck, fenghua.yu, takata,
geert, james.hogan, monstr, yasutake.koichi, ralf, jonas, jejb,
deller, benh, paulus, schwidefsky, heiko.carstens, liqin.linux,
lennox.wu, cmetcalf, gxt, linux-xtensa, akpm, oleg, tj, hch,
Richard Weinberger
Use the common helper instead of it's own variant.
Signed-off-by: Richard Weinberger <richard@nod.at>
---
arch/x86/kernel/signal.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
index 9e5de68..cad7c49 100644
--- a/arch/x86/kernel/signal.c
+++ b/arch/x86/kernel/signal.c
@@ -18,7 +18,6 @@
#include <linux/tracehook.h>
#include <linux/unistd.h>
#include <linux/stddef.h>
-#include <linux/personality.h>
#include <linux/uaccess.h>
#include <linux/user-return-notifier.h>
#include <linux/uprobes.h>
@@ -596,12 +595,10 @@ badframe:
static int signr_convert(int sig)
{
#ifdef CONFIG_X86_32
- struct thread_info *info = current_thread_info();
-
- if (info->exec_domain && info->exec_domain->signal_invmap && sig < 32)
- return info->exec_domain->signal_invmap[sig];
-#endif /* CONFIG_X86_32 */
+ return translate_signal(sig);
+#else /* CONFIG_X86_32 */
return sig;
+#endif
}
static int
--
1.8.4.2
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 43/44] um/x86: Use translate_signal()
2014-03-03 0:00 [PATCH 35/44] m68k: Use translate_signal() Richard Weinberger
` (6 preceding siblings ...)
2014-03-03 0:00 ` [PATCH 42/44] x86: " Richard Weinberger
@ 2014-03-03 0:00 ` Richard Weinberger
2014-03-03 0:00 ` [PATCH 44/44] xtensa: " Richard Weinberger
8 siblings, 0 replies; 10+ messages in thread
From: Richard Weinberger @ 2014-03-03 0:00 UTC (permalink / raw)
To: linux-kernel
Cc: linux-arch, viro, vgupta, catalin.marinas, will.deacon,
hskinnemoen, egtvedt, vapier, msalter, a-jacquiot, starvik,
jesper.nilsson, dhowells, rkuo, tony.luck, fenghua.yu, takata,
geert, james.hogan, monstr, yasutake.koichi, ralf, jonas, jejb,
deller, benh, paulus, schwidefsky, heiko.carstens, liqin.linux,
lennox.wu, cmetcalf, gxt, linux-xtensa, akpm, oleg, tj, hch,
Richard Weinberger
Use the common helper instead of it's own variant.
Signed-off-by: Richard Weinberger <richard@nod.at>
---
arch/x86/um/signal.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/arch/x86/um/signal.c b/arch/x86/um/signal.c
index 79d8245..1ffafa1 100644
--- a/arch/x86/um/signal.c
+++ b/arch/x86/um/signal.c
@@ -5,7 +5,6 @@
*/
-#include <linux/personality.h>
#include <linux/ptrace.h>
#include <linux/kernel.h>
#include <asm/unistd.h>
@@ -504,7 +503,7 @@ int setup_signal_stack_si(unsigned long stack_top, struct ksignal *ksig,
struct pt_regs *regs, sigset_t *set)
{
struct rt_sigframe __user *frame;
- int err = 0, sig = ksig->sig;
+ int err = 0;
frame = (struct rt_sigframe __user *)
round_down(stack_top - sizeof(struct rt_sigframe), 16);
@@ -550,14 +549,8 @@ int setup_signal_stack_si(unsigned long stack_top, struct ksignal *ksig,
return err;
/* Set up registers for signal handler */
- {
- struct exec_domain *ed = current_thread_info()->exec_domain;
- if (unlikely(ed && ed->signal_invmap && sig < 32))
- sig = ed->signal_invmap[sig];
- }
-
PT_REGS_SP(regs) = (unsigned long) frame;
- PT_REGS_DI(regs) = sig;
+ PT_REGS_DI(regs) = translate_signal(ksig->sig);
/* In case the signal handler was declared without prototypes */
PT_REGS_AX(regs) = 0;
--
1.8.4.2
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 44/44] xtensa: Use translate_signal()
2014-03-03 0:00 [PATCH 35/44] m68k: Use translate_signal() Richard Weinberger
` (7 preceding siblings ...)
2014-03-03 0:00 ` [PATCH 43/44] um/x86: " Richard Weinberger
@ 2014-03-03 0:00 ` Richard Weinberger
8 siblings, 0 replies; 10+ messages in thread
From: Richard Weinberger @ 2014-03-03 0:00 UTC (permalink / raw)
To: linux-kernel
Cc: linux-arch, viro, vgupta, catalin.marinas, will.deacon,
hskinnemoen, egtvedt, vapier, msalter, a-jacquiot, starvik,
jesper.nilsson, dhowells, rkuo, tony.luck, fenghua.yu, takata,
geert, james.hogan, monstr, yasutake.koichi, ralf, jonas, jejb,
deller, benh, paulus, schwidefsky, heiko.carstens, liqin.linux,
lennox.wu, cmetcalf, gxt, linux-xtensa, akpm, oleg, tj, hch,
Richard Weinberger
Use the common helper instead of it's own open coded variant.
Signed-off-by: Richard Weinberger <richard@nod.at>
---
arch/xtensa/kernel/signal.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/arch/xtensa/kernel/signal.c b/arch/xtensa/kernel/signal.c
index 4612321..905a574 100644
--- a/arch/xtensa/kernel/signal.c
+++ b/arch/xtensa/kernel/signal.c
@@ -18,7 +18,6 @@
#include <linux/signal.h>
#include <linux/errno.h>
#include <linux/ptrace.h>
-#include <linux/personality.h>
#include <linux/tracehook.h>
#include <asm/ucontext.h>
@@ -335,8 +334,7 @@ static int setup_frame(struct ksignal *ksig, sigset_t *set,
struct pt_regs *regs)
{
struct rt_sigframe *frame;
- int err = 0, sig = ksig->sig;
- int signal;
+ int err = 0, signal;
unsigned long sp, ra, tp;
sp = regs->areg[1];
@@ -354,11 +352,7 @@ static int setup_frame(struct ksignal *ksig, sigset_t *set,
return -EFAULT;
}
- signal = current_thread_info()->exec_domain
- && current_thread_info()->exec_domain->signal_invmap
- && sig < 32
- ? current_thread_info()->exec_domain->signal_invmap[sig]
- : sig;
+ signal = translate_signal(ksig->sig);
if (ksig->ka.sa.sa_flags & SA_SIGINFO) {
err |= copy_siginfo_to_user(&frame->info, &ksig->info);
--
1.8.4.2
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2014-03-03 0:03 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-03-03 0:00 [PATCH 35/44] m68k: Use translate_signal() Richard Weinberger
2014-03-03 0:00 ` [PATCH 36/44] microblaze: " Richard Weinberger
2014-03-03 0:00 ` [PATCH 37/44] mn10300: " Richard Weinberger
2014-03-03 0:00 ` [PATCH 38/44] s390: " Richard Weinberger
2014-03-03 0:00 ` [PATCH 39/44] sh: " Richard Weinberger
2014-03-03 0:00 ` [PATCH 40/44] tile: " Richard Weinberger
2014-03-03 0:00 ` [PATCH 41/44] unicore32: " Richard Weinberger
2014-03-03 0:00 ` [PATCH 42/44] x86: " Richard Weinberger
2014-03-03 0:00 ` [PATCH 43/44] um/x86: " Richard Weinberger
2014-03-03 0:00 ` [PATCH 44/44] xtensa: " Richard Weinberger
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.