Hi Alexey,
Today's linux-next merge of the proc tree got a conflict in kernel/exit.c
between commit c69e8d9c01db2adc503464993c358901c9af9de4 ("CRED: Use RCU
to access another task's creds and to release a task's own creds") from
the security-testing tree and commit
214ce93109bdec6fa474c8f742d56911180a8d4a ("proc: implement support for
automounts in task directories") from the proc tree.
I fixed it up (see below) and can carry the fix.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --cc kernel/exit.c
index 048065d,abd5bd4..0000000
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@@ -166,10 -164,8 +166,11 @@@ void release_task(struct task_struct *
int zap_leader;
repeat:
tracehook_prepare_release_task(p);
- atomic_dec(&p->user->processes);
+ /* don't need to get the RCU readlock here - the process is dead and
+ * can't be modifying its own credentials */
+ atomic_dec(&__task_cred(p)->user->processes);
+
+ proc_shrink_automounts();
proc_flush_task(p);
write_lock_irq(&tasklist_lock);
tracehook_finish_release_task(p);
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
