timekeeping: Fix timezone update

[safe/jmp/linux-2.6] / kernel / user_namespace.c

diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
index 7908431..b2d70d3 100644 (file)
--- a/kernel/user_namespace.c
+++ b/kernel/user_namespace.c
@@ -54,18 +54,31 @@ int create_user_ns(struct cred *new)
 #endif
        /* tgcred will be cleared in our caller bc CLONE_THREAD won't be set */
 
-       /* alloc_uid() incremented the userns refcount.  Just set it to 1 */
-       kref_set(&ns->kref, 1);
+       /* root_user holds a reference to ns, our reference can be dropped */
+       put_user_ns(ns);
 
        return 0;
 }
 
-void free_user_ns(struct kref *kref)
+/*
+ * Deferred destructor for a user namespace.  This is required because
+ * free_user_ns() may be called with uidhash_lock held, but we need to call
+ * back to free_uid() which will want to take the lock again.
+ */
+static void free_user_ns_work(struct work_struct *work)
 {
-       struct user_namespace *ns;
-
-       ns = container_of(kref, struct user_namespace, kref);
+       struct user_namespace *ns =
+               container_of(work, struct user_namespace, destroyer);
        free_uid(ns->creator);
        kfree(ns);
 }
+
+void free_user_ns(struct kref *kref)
+{
+       struct user_namespace *ns =
+               container_of(kref, struct user_namespace, kref);
+
+       INIT_WORK(&ns->destroyer, free_user_ns_work);
+       schedule_work(&ns->destroyer);
+}
 EXPORT_SYMBOL(free_user_ns);