lkml.org 
[lkml]   [2011]   [Aug]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 39/43] xtensa: Use set_current_blocked() and block_sigmask()
    Date
    From: Matt Fleming <matt.fleming@intel.com>

    As described in e6fa16ab ("signal: sigprocmask() should do
    retarget_shared_pending()") the modification of current->blocked is
    incorrect as we need to check whether the signal we're about to block
    is pending in the shared queue.

    Also, use the new helper function block_sigmask() which centralises
    the code for updating current->blocked after successfully delivering a
    signal and reduces the amount of duplicate code across
    architectures. In the past some architectures got this code wrong, so
    using this helper function should stop that from happening again.

    Cc: Oleg Nesterov <oleg@redhat.com>
    Cc: Chris Zankel <chris@zankel.net>
    Signed-off-by: Matt Fleming <matt.fleming@intel.com>
    ---

    v2 of this patch depends on "[PATCH 01/43] signal: Add block_sigmask()
    for adding sigmask to current->blocked" so they need to go through the
    same tree but this patch would benefit from some maintainer ACK's.

    arch/xtensa/kernel/signal.c | 17 +++--------------
    1 files changed, 3 insertions(+), 14 deletions(-)

    diff --git a/arch/xtensa/kernel/signal.c b/arch/xtensa/kernel/signal.c
    index 17ceab8..b69b000 100644
    --- a/arch/xtensa/kernel/signal.c
    +++ b/arch/xtensa/kernel/signal.c
    @@ -260,10 +260,7 @@ asmlinkage long xtensa_rt_sigreturn(long a0, long a1, long a2, long a3,
    goto badframe;

    sigdelsetmask(&set, ~_BLOCKABLE);
    - spin_lock_irq(&current->sighand->siglock);
    - current->blocked = set;
    - recalc_sigpending();
    - spin_unlock_irq(&current->sighand->siglock);
    + set_current_blocked(&set);

    if (restore_sigcontext(regs, frame))
    goto badframe;
    @@ -448,11 +445,8 @@ asmlinkage long xtensa_rt_sigsuspend(sigset_t __user *unewset,
    return -EFAULT;

    sigdelsetmask(&newset, ~_BLOCKABLE);
    - spin_lock_irq(&current->sighand->siglock);
    saveset = current->blocked;
    - current->blocked = newset;
    - recalc_sigpending();
    - spin_unlock_irq(&current->sighand->siglock);
    + set_current_blocked(&newset);

    regs->areg[2] = -EINTR;
    while (1) {
    @@ -539,12 +533,7 @@ int do_signal(struct pt_regs *regs, sigset_t *oldset)
    if (ret)
    return ret;

    - spin_lock_irq(&current->sighand->siglock);
    - sigorsets(&current->blocked, &current->blocked, &ka.sa.sa_mask);
    - if (!(ka.sa.sa_flags & SA_NODEFER))
    - sigaddset(&current->blocked, signr);
    - recalc_sigpending();
    - spin_unlock_irq(&current->sighand->siglock);
    + block_sigmask(&ka, signr);
    if (current->ptrace & PT_SINGLESTEP)
    task_pt_regs(current)->icountlevel = 1;

    --
    1.7.4.4


    \
     
     \ /
      Last update: 2011-08-19 18:53    [W:4.622 / U:0.252 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site