lkml.org 
[lkml]   [2011]   [Aug]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 21/41] OpenRISC: Use set_current_blocked()
    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.

    Cc: Oleg Nesterov <oleg@redhat.com>
    Cc: Jonas Bonn <jonas@southpole.se>
    Cc: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Matt Fleming <matt.fleming@intel.com>
    ---
    arch/openrisc/kernel/signal.c | 15 +++++----------
    1 files changed, 5 insertions(+), 10 deletions(-)

    diff --git a/arch/openrisc/kernel/signal.c b/arch/openrisc/kernel/signal.c
    index b0bdfda..50a5156 100644
    --- a/arch/openrisc/kernel/signal.c
    +++ b/arch/openrisc/kernel/signal.c
    @@ -108,10 +108,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;
    @@ -266,19 +263,17 @@ handle_signal(unsigned long sig,
    siginfo_t *info, struct k_sigaction *ka,
    sigset_t *oldset, struct pt_regs *regs)
    {
    + sigset_t blocked;
    int ret;

    ret = setup_rt_frame(sig, ka, info, oldset, regs);
    if (ret)
    return ret;

    - spin_lock_irq(&current->sighand->siglock);
    - sigorsets(&current->blocked, &current->blocked, &ka->sa.sa_mask);
    + sigorsets(&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);
    + sigaddset(&blocked, sig);
    + set_current_blocked(&blocked);

    return 0;
    }
    --
    1.7.4.4


    \
     
     \ /
      Last update: 2011-08-11 16:05    [W:0.021 / U:32.604 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site