[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1313772419-21951-35-git-send-email-matt@console-pimps.org>
Date: Fri, 19 Aug 2011 17:46:50 +0100
From: Matt Fleming <matt@...sole-pimps.org>
To: Oleg Nesterov <oleg@...hat.com>
Cc: linux-kernel@...r.kernel.org
Subject: [PATCH v2 34/43] um: Don't restore current->blocked on error
From: Matt Fleming <matt.fleming@...el.com>
If we fail to setup the signal stack frame then we don't need to
restore current->blocked because it is not modified by
setup_signal_stack_*.
Acked-by: Oleg Nesterov <oleg@...hat.com>
Acked-by: Richard Weinberger <richard@....at>
Tested-by: Richard Weinberger <richard@....at>
Signed-off-by: Matt Fleming <matt.fleming@...el.com>
---
arch/um/kernel/signal.c | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/arch/um/kernel/signal.c b/arch/um/kernel/signal.c
index 9aa5cba..9a5ffe1 100644
--- a/arch/um/kernel/signal.c
+++ b/arch/um/kernel/signal.c
@@ -66,13 +66,9 @@ static int handle_signal(struct pt_regs *regs, unsigned long signr,
#endif
err = setup_signal_stack_si(sp, signr, ka, regs, info, oldset);
- if (err) {
- spin_lock_irq(¤t->sighand->siglock);
- current->blocked = *oldset;
- recalc_sigpending();
- spin_unlock_irq(¤t->sighand->siglock);
+ if (err)
force_sigsegv(signr, current);
- } else
+ else
block_sigmask(ka, signr);
return err;
--
1.7.4.4
--
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