Messages in this thread Patch in this message | | | From | Matt Fleming <> | Subject | [PATCH 37/41] autofs4: Use set_current_blocked() | Date | Thu, 11 Aug 2011 14:57:11 +0100 |
| |
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: Ian Kent <raven@themaw.net> Signed-off-by: Matt Fleming <matt.fleming@intel.com> --- fs/autofs4/waitq.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c index e1fbdee..64ff15a 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(¤t->sighand->siglock, irqflags); oldset = current->blocked; - siginitsetinv(¤t->blocked, SHUTDOWN_SIGS & ~oldset.sig[0]); - recalc_sigpending(); - spin_unlock_irqrestore(¤t->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(¤t->sighand->siglock, irqflags); - current->blocked = oldset; - recalc_sigpending(); - spin_unlock_irqrestore(¤t->sighand->siglock, irqflags); + + set_current_blocked(&oldset); } else { DPRINTK("skipped sleeping"); } -- 1.7.4.4
| |