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 01/41] alpha: Use set_current_blocked()
    Date
    From: Matt Fleming <matt.fleming@linux.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 for shared signals we're about to block.

    Cc: Oleg Nesterov <oleg@redhat.com>
    Cc: Richard Henderson <rth@twiddle.net>
    Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
    Cc: Matt Turner <mattst88@gmail.com>
    Cc: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Matt Fleming <matt.fleming@linux.intel.com>
    ---
    arch/alpha/kernel/signal.c | 31 +++++++++++++------------------
    1 files changed, 13 insertions(+), 18 deletions(-)

    diff --git a/arch/alpha/kernel/signal.c b/arch/alpha/kernel/signal.c
    index 6f7feb5..ec6fe13 100644
    --- a/arch/alpha/kernel/signal.c
    +++ b/arch/alpha/kernel/signal.c
    @@ -120,12 +120,13 @@ SYSCALL_DEFINE5(rt_sigaction, int, sig, const struct sigaction __user *, act,
    */
    SYSCALL_DEFINE1(sigsuspend, old_sigset_t, mask)
    {
    - mask &= _BLOCKABLE;
    - spin_lock_irq(&current->sighand->siglock);
    + sigset_t blocked;
    +
    current->saved_sigmask = current->blocked;
    - siginitset(&current->blocked, mask);
    - recalc_sigpending();
    - spin_unlock_irq(&current->sighand->siglock);
    +
    + mask &= _BLOCKABLE;
    + siginitset(&blocked, mask);
    + set_current_blocked(&blocked);

    current->state = TASK_INTERRUPTIBLE;
    schedule();
    @@ -238,10 +239,7 @@ do_sigreturn(struct sigcontext __user *sc, struct pt_regs *regs,
    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, regs, sw))
    goto give_sigsegv;
    @@ -276,10 +274,7 @@ do_rt_sigreturn(struct rt_sigframe __user *frame, struct pt_regs *regs,
    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_block(&set);

    if (restore_sigcontext(&frame->uc.uc_mcontext, regs, sw))
    goto give_sigsegv;
    @@ -502,12 +497,12 @@ handle_signal(int sig, struct k_sigaction *ka, siginfo_t *info,
    ret = setup_frame(sig, ka, oldset, regs, sw);

    if (ret == 0) {
    - spin_lock_irq(&current->sighand->siglock);
    - sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);
    + sigset_t blocked;
    +
    + 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 ret;
    --
    1.7.4.4


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