lkml.org 
[lkml]   [2011]   [Aug]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 40/43] autofs4: 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.

    Acked-by: Oleg Nesterov <oleg@redhat.com>
    Cc: Ian Kent <raven@themaw.net>
    Signed-off-by: Matt Fleming <matt.fleming@intel.com>
    ---
    fs/autofs4/waitq.c | 13 ++++---------
    1 files changed, 4 insertions(+), 9 deletions(-)

    diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
    index e1fbdee..58ba49a 100644
    --- a/fs/autofs4/waitq.c
    +++ b/fs/autofs4/waitq.c
    @@ -458,21 +458,16 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
    */
    if (wq->name.name) {
    /* Block all but "shutdown" signals while waiting */
    - sigset_t oldset;
    + sigset_t oldset, blocked;
    unsigned long irqflags;

    - spin_lock_irqsave(&current->sighand->siglock, irqflags);
    oldset = current->blocked;
    - siginitsetinv(&current->blocked, SHUTDOWN_SIGS & ~oldset.sig[0]);
    - recalc_sigpending();
    - spin_unlock_irqrestore(&current->sighand->siglock, irqflags);
    + siginitsetinv(&blocked, SHUTDOWN_SIGS & ~oldset.sig[0]);
    + set_current_blocked(&blocked);

    wait_event_interruptible(wq->queue, wq->name.name == NULL);

    - spin_lock_irqsave(&current->sighand->siglock, irqflags);
    - current->blocked = oldset;
    - recalc_sigpending();
    - spin_unlock_irqrestore(&current->sighand->siglock, irqflags);
    + set_current_blocked(&oldset);
    } else {
    DPRINTK("skipped sleeping");
    }
    --
    1.7.4.4


    \
     
     \ /
      Last update: 2011-08-19 18:51    [W:0.024 / U:29.912 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site