[PATCH -mm 2/3] proc: make collect_sigign_sigcatch() rcu-safe

From: Oleg Nesterov
Date: Mon Mar 22 2010 - 14:43:10 EST


Make collect_sigign_sigcatch() rcu-safe. The necessary changes are simple,
use rcu_dereference() to get ->sighand and check it is not NULL.

In theory, this ->sighand can be re-used under us (but it can't go away).
We could check task->sighand == sighand once again after the main loop
to prevent the race with exit/exec, but I don't think this is really
needed for fs/proc.

Signed-off-by: Oleg Nesterov <oleg@xxxxxxxxxx>
---

fs/proc/array.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)

--- 34-rc1/fs/proc/array.c~PROC_2_SIGCATCH_RCU 2010-03-22 17:04:44.000000000 +0100
+++ 34-rc1/fs/proc/array.c 2010-03-22 17:39:42.000000000 +0100
@@ -235,13 +235,18 @@ static void render_sigset_t(struct seq_f
seq_printf(m, "\n");
}

+/* needs ->siglock or rcu_read_lock() */
static void collect_sigign_sigcatch(struct task_struct *p, sigset_t *ign,
sigset_t *catch)
{
+ struct sighand_struct *sighand = rcu_dereference(p->sighand);
struct k_sigaction *k;
int i;

- k = p->sighand->action;
+ if (unlikely(!sighand))
+ return;
+
+ k = sighand->action;
for (i = 1; i <= _NSIG; ++i, ++k) {
if (k->sa.sa_handler == SIG_IGN)
sigaddset(ign, i);

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/