[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <E1P0QNz-0008ST-00@ZenIV.linux.org.uk>
Date: Tue, 28 Sep 2010 03:57:42 +0100
From: Al Viro <viro@....linux.org.uk>
To: hans-christian.egtvedt@...el.com
Cc: torvalds@...ux-foundation.org, linux-kernel@...r.kernel.org,
linux-arch@...r.kernel.org
Subject: [PATCH 3/6] avr32: fix handling of blocked signals
We do _not_ want to block anything on failure to set sigframe up
and we do not want to ignore sa_mask even when SA_NODOFER is set.
Signed-off-by: Al Viro <viro@...iv.linux.org.uk>
---
arch/avr32/kernel/signal.c | 26 +++++++++++---------------
1 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/arch/avr32/kernel/signal.c b/arch/avr32/kernel/signal.c
index 8c481fb..52affae 100644
--- a/arch/avr32/kernel/signal.c
+++ b/arch/avr32/kernel/signal.c
@@ -231,28 +231,24 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info,
/*
* Set up the stack frame
*/
- ret = setup_rt_frame(sig, ka, info, oldset, regs);
+ if (setup_rt_frame(sig, ka, info, oldset, regs) != 0)
+ goto fail;
/*
* Check that the resulting registers are sane
*/
- ret |= !valid_user_regs(regs);
+ if (!valid_user_regs(regs))
+ goto fail;
- /*
- * Block the signal if we were unsuccessful.
- */
- if (ret != 0 || !(ka->sa.sa_flags & SA_NODEFER)) {
- spin_lock_irq(¤t->sighand->siglock);
- sigorsets(¤t->blocked, ¤t->blocked,
- &ka->sa.sa_mask);
+ spin_lock_irq(¤t->sighand->siglock);
+ sigorsets(¤t->blocked, ¤t->blocked, &ka->sa.sa_mask);
+ if (!(ka->sa.sa_flags & SA_NODEFER))
sigaddset(¤t->blocked, sig);
- recalc_sigpending();
- spin_unlock_irq(¤t->sighand->siglock);
- }
-
- if (ret == 0)
- return;
+ recalc_sigpending();
+ spin_unlock_irq(¤t->sighand->siglock);
+ return;
+fail:
force_sigsegv(sig, current);
}
--
1.5.6.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists