From 9af835c1d0e15a15c98b92fd0eb56f45c9fcad71 Mon Sep 17 00:00:00 2001 From: Matt Fleming Date: Wed, 21 Mar 2012 16:33:45 -0700 Subject: [PATCH] --- yaml --- r: 292611 b: refs/heads/master c: 3785006ac3c8941feb63097c416de92114a6bc39 h: refs/heads/master i: 292609: ca8acb2597775fceb0805e3922e15a1539104a86 292607: e60f2bab68f4e9d74d5650fdf6520cd34cc996cb v: v3 --- [refs] | 2 +- trunk/arch/xtensa/kernel/signal.c | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 10d999be707b..ffb192b7e128 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ff6d21e7aafe3cf4b20697f67e656caa4daef40b +refs/heads/master: 3785006ac3c8941feb63097c416de92114a6bc39 diff --git a/trunk/arch/xtensa/kernel/signal.c b/trunk/arch/xtensa/kernel/signal.c index 24655e31d8fb..17ceab8e6479 100644 --- a/trunk/arch/xtensa/kernel/signal.c +++ b/trunk/arch/xtensa/kernel/signal.c @@ -336,8 +336,8 @@ gen_return_code(unsigned char *codemem) } -static void setup_frame(int sig, struct k_sigaction *ka, siginfo_t *info, - sigset_t *set, struct pt_regs *regs) +static int setup_frame(int sig, struct k_sigaction *ka, siginfo_t *info, + sigset_t *set, struct pt_regs *regs) { struct rt_sigframe *frame; int err = 0; @@ -422,10 +422,11 @@ static void setup_frame(int sig, struct k_sigaction *ka, siginfo_t *info, current->comm, current->pid, signal, frame, regs->pc); #endif - return; + return 0; give_sigsegv: force_sigsegv(sig, current); + return -EFAULT; } /* @@ -534,7 +535,9 @@ int do_signal(struct pt_regs *regs, sigset_t *oldset) /* Whee! Actually deliver the signal. */ /* Set up the stack frame */ - setup_frame(signr, &ka, &info, oldset, regs); + ret = setup_frame(signr, &ka, &info, oldset, regs); + if (ret) + return ret; spin_lock_irq(¤t->sighand->siglock); sigorsets(¤t->blocked, ¤t->blocked, &ka.sa.sa_mask);