[lkml]   [2011]   [Aug]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    Patch in this message
    Subject[PATCH v2 11/43] ia64: Use set_current_blocked() and block_sigmask()
    From: Matt Fleming <>

    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 <>
    Cc: Tony Luck <>
    Cc: Fenghua Yu <>
    Signed-off-by: Matt Fleming <>

    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/ia64/kernel/signal.c | 15 ++-------------
    1 files changed, 2 insertions(+), 13 deletions(-)

    diff --git a/arch/ia64/kernel/signal.c b/arch/ia64/kernel/signal.c
    index 7bdafc8..7523501 100644
    --- a/arch/ia64/kernel/signal.c
    +++ b/arch/ia64/kernel/signal.c
    @@ -201,13 +201,7 @@ ia64_rt_sigreturn (struct sigscratch *scr)
    goto give_sigsegv;

    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(sc, scr))
    goto give_sigsegv;
    @@ -427,12 +421,7 @@ handle_signal (unsigned long sig, struct k_sigaction *ka, siginfo_t *info, sigse
    if (!setup_frame(sig, ka, info, oldset, scr))
    return 0;

    - 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);

    * Let tracing know that we've done the handler setup.

     \ /
      Last update: 2011-08-19 18:49    [W:0.020 / U:0.440 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site