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 15/41] microblaze: 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: Michal Simek <monstr@monstr.eu>
    Signed-off-by: Matt Fleming <matt.fleming@intel.com>
    ---
    arch/microblaze/kernel/signal.c | 14 +++++---------
    1 files changed, 5 insertions(+), 9 deletions(-)

    diff --git a/arch/microblaze/kernel/signal.c b/arch/microblaze/kernel/signal.c
    index f2c13d5..aaf7c27 100644
    --- a/arch/microblaze/kernel/signal.c
    +++ b/arch/microblaze/kernel/signal.c
    @@ -105,10 +105,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, &rval))
    goto badframe;
    @@ -315,6 +312,7 @@ static int
    handle_signal(unsigned long sig, struct k_sigaction *ka,
    siginfo_t *info, sigset_t *oldset, struct pt_regs *regs)
    {
    + sigset_t blocked;
    int ret;

    /* Set up the stack frame */
    @@ -326,12 +324,10 @@ handle_signal(unsigned long sig, struct k_sigaction *ka,
    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:01    [W:0.025 / U:87.700 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site