* [PATCH] signals: convert the X86_32 code to use set_current_blocked()
@ 2011-07-10 19:27 Oleg Nesterov
2011-07-11 9:31 ` Matt Fleming
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Oleg Nesterov @ 2011-07-10 19:27 UTC (permalink / raw)
To: Andrew Morton; +Cc: Tejun Heo, Matt Fleming, linux-kernel
sys_sigsuspend() and sys_sigreturn() change ->blocked directly.
This is not correct, see the changelog in e6fa16ab
"signal: sigprocmask() should do retarget_shared_pending()"
Change them to use set_current_blocked().
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
---
arch/x86/kernel/signal.c | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
--- ptrace/arch/x86/kernel/signal.c~3_x86_set_current_blocked 2011-07-10 19:45:21.000000000 +0200
+++ ptrace/arch/x86/kernel/signal.c 2011-07-10 21:00:04.000000000 +0200
@@ -485,17 +485,18 @@ static int __setup_rt_frame(int sig, str
asmlinkage int
sys_sigsuspend(int history0, int history1, old_sigset_t mask)
{
- mask &= _BLOCKABLE;
- spin_lock_irq(¤t->sighand->siglock);
+ sigset_t blocked;
+
current->saved_sigmask = current->blocked;
- siginitset(¤t->blocked, mask);
- recalc_sigpending();
- spin_unlock_irq(¤t->sighand->siglock);
+
+ mask &= _BLOCKABLE;
+ siginitset(&blocked, mask);
+ set_current_blocked(&blocked);
current->state = TASK_INTERRUPTIBLE;
schedule();
- set_restore_sigmask();
+ set_restore_sigmask();
return -ERESTARTNOHAND;
}
@@ -572,10 +573,7 @@ unsigned long sys_sigreturn(struct pt_re
goto badframe;
sigdelsetmask(&set, ~_BLOCKABLE);
- spin_lock_irq(¤t->sighand->siglock);
- current->blocked = set;
- recalc_sigpending();
- spin_unlock_irq(¤t->sighand->siglock);
+ set_current_blocked(&set);
if (restore_sigcontext(regs, &frame->sc, &ax))
goto badframe;
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] signals: convert the X86_32 code to use set_current_blocked()
2011-07-10 19:27 [PATCH] signals: convert the X86_32 code to use set_current_blocked() Oleg Nesterov
@ 2011-07-11 9:31 ` Matt Fleming
2011-07-13 12:30 ` Tejun Heo
2011-07-15 5:46 ` [tip:x86/signal] x86, signals: Convert " tip-bot for Oleg Nesterov
2 siblings, 0 replies; 4+ messages in thread
From: Matt Fleming @ 2011-07-11 9:31 UTC (permalink / raw)
To: Oleg Nesterov; +Cc: Andrew Morton, Tejun Heo, linux-kernel
On Sun, 10 Jul 2011 21:27:27 +0200
Oleg Nesterov <oleg@redhat.com> wrote:
> sys_sigsuspend() and sys_sigreturn() change ->blocked directly.
> This is not correct, see the changelog in e6fa16ab
> "signal: sigprocmask() should do retarget_shared_pending()"
>
> Change them to use set_current_blocked().
>
> Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Reviewed-by: Matt Fleming <matt.fleming@linux.intel.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] signals: convert the X86_32 code to use set_current_blocked()
2011-07-10 19:27 [PATCH] signals: convert the X86_32 code to use set_current_blocked() Oleg Nesterov
2011-07-11 9:31 ` Matt Fleming
@ 2011-07-13 12:30 ` Tejun Heo
2011-07-15 5:46 ` [tip:x86/signal] x86, signals: Convert " tip-bot for Oleg Nesterov
2 siblings, 0 replies; 4+ messages in thread
From: Tejun Heo @ 2011-07-13 12:30 UTC (permalink / raw)
To: Oleg Nesterov; +Cc: Andrew Morton, Matt Fleming, linux-kernel
On Sun, Jul 10, 2011 at 09:27:27PM +0200, Oleg Nesterov wrote:
> sys_sigsuspend() and sys_sigreturn() change ->blocked directly.
> This is not correct, see the changelog in e6fa16ab
> "signal: sigprocmask() should do retarget_shared_pending()"
>
> Change them to use set_current_blocked().
>
> Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: Tejun Heo <tj@kernel.org>
--
tejun
^ permalink raw reply [flat|nested] 4+ messages in thread
* [tip:x86/signal] x86, signals: Convert the X86_32 code to use set_current_blocked()
2011-07-10 19:27 [PATCH] signals: convert the X86_32 code to use set_current_blocked() Oleg Nesterov
2011-07-11 9:31 ` Matt Fleming
2011-07-13 12:30 ` Tejun Heo
@ 2011-07-15 5:46 ` tip-bot for Oleg Nesterov
2 siblings, 0 replies; 4+ messages in thread
From: tip-bot for Oleg Nesterov @ 2011-07-15 5:46 UTC (permalink / raw)
To: linux-tip-commits; +Cc: linux-kernel, hpa, mingo, oleg, tglx, hpa
Commit-ID: 3982294b0342474ff91472b34c6afb701785f524
Gitweb: http://git.kernel.org/tip/3982294b0342474ff91472b34c6afb701785f524
Author: Oleg Nesterov <oleg@redhat.com>
AuthorDate: Sun, 10 Jul 2011 21:27:27 +0200
Committer: H. Peter Anvin <hpa@linux.intel.com>
CommitDate: Thu, 14 Jul 2011 21:21:57 -0700
x86, signals: Convert the X86_32 code to use set_current_blocked()
sys_sigsuspend() and sys_sigreturn() change ->blocked directly.
This is not correct, see the changelog in e6fa16ab
"signal: sigprocmask() should do retarget_shared_pending()"
Change them to use set_current_blocked().
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Link: http://lkml.kernel.org/r/20110710192727.GA31759@redhat.com
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
---
arch/x86/kernel/signal.c | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
index 40a2493..bf9345d 100644
--- a/arch/x86/kernel/signal.c
+++ b/arch/x86/kernel/signal.c
@@ -485,17 +485,18 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
asmlinkage int
sys_sigsuspend(int history0, int history1, old_sigset_t mask)
{
- mask &= _BLOCKABLE;
- spin_lock_irq(¤t->sighand->siglock);
+ sigset_t blocked;
+
current->saved_sigmask = current->blocked;
- siginitset(¤t->blocked, mask);
- recalc_sigpending();
- spin_unlock_irq(¤t->sighand->siglock);
+
+ mask &= _BLOCKABLE;
+ siginitset(&blocked, mask);
+ set_current_blocked(&blocked);
current->state = TASK_INTERRUPTIBLE;
schedule();
- set_restore_sigmask();
+ set_restore_sigmask();
return -ERESTARTNOHAND;
}
@@ -572,10 +573,7 @@ unsigned long sys_sigreturn(struct pt_regs *regs)
goto badframe;
sigdelsetmask(&set, ~_BLOCKABLE);
- spin_lock_irq(¤t->sighand->siglock);
- current->blocked = set;
- recalc_sigpending();
- spin_unlock_irq(¤t->sighand->siglock);
+ set_current_blocked(&set);
if (restore_sigcontext(regs, &frame->sc, &ax))
goto badframe;
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-07-15 5:47 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-07-10 19:27 [PATCH] signals: convert the X86_32 code to use set_current_blocked() Oleg Nesterov
2011-07-11 9:31 ` Matt Fleming
2011-07-13 12:30 ` Tejun Heo
2011-07-15 5:46 ` [tip:x86/signal] x86, signals: Convert " tip-bot for Oleg Nesterov
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.