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 10/40] h8300: 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 whether the signal we're about to block
    is pending in the shared queue.

    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: Yoshinori Sato <ysato@users.sourceforge.jp>
    Signed-off-by: Matt Fleming <matt.fleming@intel.com>
    ---
    arch/h8300/kernel/signal.c | 33 +++++++++------------------------
    1 files changed, 9 insertions(+), 24 deletions(-)

    diff --git a/arch/h8300/kernel/signal.c b/arch/h8300/kernel/signal.c
    index af842c3..cd63f5a 100644
    --- a/arch/h8300/kernel/signal.c
    +++ b/arch/h8300/kernel/signal.c
    @@ -57,14 +57,13 @@ asmlinkage int do_signal(struct pt_regs *regs, sigset_t *oldset);
    asmlinkage int do_sigsuspend(struct pt_regs *regs)
    {
    old_sigset_t mask = regs->er3;
    - sigset_t saveset;
    + sigset_t saveset, blocked;

    - mask &= _BLOCKABLE;
    - spin_lock_irq(&current->sighand->siglock);
    saveset = current->blocked;
    - siginitset(&current->blocked, mask);
    - recalc_sigpending();
    - spin_unlock_irq(&current->sighand->siglock);
    +
    + mask &= _BLOCKABLE;
    + siginitset(&blocked, mask);
    + set_current_blocked(&blocked);

    regs->er0 = -EINTR;
    while (1) {
    @@ -90,11 +89,8 @@ do_rt_sigsuspend(struct pt_regs *regs)
    return -EFAULT;
    sigdelsetmask(&newset, ~_BLOCKABLE);

    - spin_lock_irq(&current->sighand->siglock);
    saveset = current->blocked;
    - current->blocked = newset;
    - recalc_sigpending();
    - spin_unlock_irq(&current->sighand->siglock);
    + set_current_blocked(&newset);

    regs->er0 = -EINTR;
    while (1) {
    @@ -232,10 +228,7 @@ asmlinkage int do_sigreturn(unsigned long __unused,...)
    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->sc, &er0))
    goto badframe;
    @@ -260,10 +253,7 @@ asmlinkage int do_rt_sigreturn(unsigned long __unused,...)
    goto badframe;

    sigdelsetmask(&set, ~_BLOCKABLE);
    - spin_unlock_irq(&current->sighand->siglock);
    - current->blocked = set;
    - recalc_sigpending();
    - spin_lock_irq(&current->sighand->siglock);
    + set_current_blocked(&set);

    if (restore_sigcontext(regs, &frame->uc.uc_mcontext, &er0))
    goto badframe;
    @@ -489,12 +479,7 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka,
    else
    setup_frame(sig, ka, oldset, regs);

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

    /*
    --
    1.7.4.4


    \
     
     \ /
      Last update: 2012-02-14 12:45    [W:0.038 / U:8.336 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site