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 02/40] arm: 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 for shared signals we're about to block.

    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: Russell King <linux@arm.linux.org.uk>
    Cc: Arnd Bergmann <arnd.bergmann@linaro.org>
    Cc: Dave Martin <dave.martin@linaro.org>
    Cc: Nicolas Pitre <nicolas.pitre@linaro.org>
    Cc: Will Deacon <will.deacon@arm.com>
    Cc: linux-arm-kernel@lists.infradead.org
    Signed-off-by: Matt Fleming <matt.fleming@intel.com>
    ---
    arch/arm/kernel/signal.c | 24 ++++++++----------------
    1 files changed, 8 insertions(+), 16 deletions(-)

    diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
    index 9e617bd..7cb532f 100644
    --- a/arch/arm/kernel/signal.c
    +++ b/arch/arm/kernel/signal.c
    @@ -66,12 +66,13 @@ const unsigned long syscall_restart_code[2] = {
    */
    asmlinkage int sys_sigsuspend(int restart, unsigned long oldmask, 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();
    @@ -280,10 +281,7 @@ static int restore_sigframe(struct pt_regs *regs, struct sigframe __user *sf)
    err = __copy_from_user(&set, &sf->uc.uc_sigmask, sizeof(set));
    if (err == 0) {
    sigdelsetmask(&set, ~_BLOCKABLE);
    - spin_lock_irq(&current->sighand->siglock);
    - current->blocked = set;
    - recalc_sigpending();
    - spin_unlock_irq(&current->sighand->siglock);
    + set_current_blocked(&set);
    }

    __get_user_error(regs->ARM_r0, &sf->uc.uc_mcontext.arm_r0, err);
    @@ -636,13 +634,7 @@ handle_signal(unsigned long sig, struct k_sigaction *ka,
    /*
    * Block the signal if we were successful.
    */
    - spin_lock_irq(&tsk->sighand->siglock);
    - sigorsets(&tsk->blocked, &tsk->blocked,
    - &ka->sa.sa_mask);
    - if (!(ka->sa.sa_flags & SA_NODEFER))
    - sigaddset(&tsk->blocked, sig);
    - recalc_sigpending();
    - spin_unlock_irq(&tsk->sighand->siglock);
    + block_sigmask(ka, sig);

    return 0;
    }
    --
    1.7.4.4


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