lkml.org 
[lkml]   [2012]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 24/40] OpenRISC: 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 introduced in commit 5e6292c0f28f
    ("signal: add block_sigmask() for adding sigmask to current->blocked")
    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: Jonas Bonn <jonas@southpole.se>
    Cc: Arnd Bergmann <arnd@arndb.de>
    Cc: linux@lists.openrisc.net
    Signed-off-by: Matt Fleming <matt.fleming@intel.com>
    ---
    arch/openrisc/kernel/signal.c | 13 ++-----------
    1 files changed, 2 insertions(+), 11 deletions(-)

    diff --git a/arch/openrisc/kernel/signal.c b/arch/openrisc/kernel/signal.c
    index 14764e8..cf35ea0 100644
    --- a/arch/openrisc/kernel/signal.c
    +++ b/arch/openrisc/kernel/signal.c
    @@ -102,10 +102,7 @@ asmlinkage long _sys_rt_sigreturn(struct pt_regs *regs)
    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->uc.uc_mcontext))
    goto badframe;
    @@ -265,13 +262,7 @@ handle_signal(unsigned long sig,
    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, sig);
    - recalc_sigpending();
    -
    - spin_unlock_irq(&current->sighand->siglock);
    + block_sigmask(ka, sig);

    return 0;
    }
    --
    1.7.4.4


    \
     
     \ /
      Last update: 2012-02-14 12:49    [W:0.020 / U:0.868 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site