|
@@ -174,7 +174,7 @@ static inline void __user *get_sigframe(struct ksignal *ksig,
|
|
|
static int setup_frame(struct ksignal *ksig, sigset_t *set)
|
|
|
{
|
|
|
struct sigframe __user *frame;
|
|
|
- int rsig, sig = ksig->sig;
|
|
|
+ int sig = ksig->sig;
|
|
|
|
|
|
set_fs(USER_DS);
|
|
|
|
|
@@ -183,13 +183,7 @@ static int setup_frame(struct ksignal *ksig, sigset_t *set)
|
|
|
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(sig, &frame->sig) < 0)
|
|
|
return -EFAULT;
|
|
|
|
|
|
if (setup_sigcontext(&frame->sc, set->sig[0]))
|
|
@@ -255,7 +249,7 @@ static int setup_frame(struct ksignal *ksig, sigset_t *set)
|
|
|
static int setup_rt_frame(struct ksignal *ksig, sigset_t *set)
|
|
|
{
|
|
|
struct rt_sigframe __user *frame;
|
|
|
- int rsig, sig = ksig->sig;
|
|
|
+ int sig = ksig->sig;
|
|
|
|
|
|
set_fs(USER_DS);
|
|
|
|
|
@@ -264,13 +258,7 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set)
|
|
|
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(sig, &frame->sig) ||
|
|
|
__put_user(&frame->info, &frame->pinfo) ||
|
|
|
__put_user(&frame->uc, &frame->puc))
|
|
|
return -EFAULT;
|