[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1313071035-12047-39-git-send-email-matt@console-pimps.org>
Date: Thu, 11 Aug 2011 14:57:12 +0100
From: Matt Fleming <matt@...sole-pimps.org>
To: Oleg Nesterov <oleg@...hat.com>
Cc: linux-kernel@...r.kernel.org, Jan Harkes <jaharkes@...cmu.edu>
Subject: [PATCH 38/41] coda: Use set_current_blocked()
From: Matt Fleming <matt.fleming@...el.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@...hat.com>
Cc: Jan Harkes <jaharkes@...cmu.edu>
Signed-off-by: Matt Fleming <matt.fleming@...el.com>
---
fs/coda/upcall.c | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/fs/coda/upcall.c b/fs/coda/upcall.c
index 9727e0c..ce5925d 100644
--- a/fs/coda/upcall.c
+++ b/fs/coda/upcall.c
@@ -575,24 +575,21 @@ int venus_statfs(struct dentry *dentry, struct kstatfs *sfs)
*/
static void coda_block_signals(sigset_t *old)
{
- spin_lock_irq(¤t->sighand->siglock);
+ sigset_t blocked;
+
*old = current->blocked;
- sigfillset(¤t->blocked);
- sigdelset(¤t->blocked, SIGKILL);
- sigdelset(¤t->blocked, SIGSTOP);
- sigdelset(¤t->blocked, SIGINT);
+ sigfillset(&blocked);
+ sigdelset(&blocked, SIGKILL);
+ sigdelset(&blocked, SIGSTOP);
+ sigdelset(&blocked, SIGINT);
- recalc_sigpending();
- spin_unlock_irq(¤t->sighand->siglock);
+ set_current_blocked(&blocked);
}
static void coda_unblock_signals(sigset_t *old)
{
- spin_lock_irq(¤t->sighand->siglock);
- current->blocked = *old;
- recalc_sigpending();
- spin_unlock_irq(¤t->sighand->siglock);
+ set_current_blocked(old);
}
/* Don't allow signals to interrupt the following upcalls before venus
--
1.7.4.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists