x86/vdso: Zap vvar pages when switching to a time namespace

[linux-2.6-microblaze.git] / kernel / time / namespace.c

diff --git a/kernel/time/namespace.c b/kernel/time/namespace.c
index d705c15..0732964 100644 (file)
--- a/kernel/time/namespace.c
+++ b/kernel/time/namespace.c
@@ -281,6 +281,7 @@ static void timens_put(struct ns_common *ns)
 static int timens_install(struct nsproxy *nsproxy, struct ns_common *new)
 {
        struct time_namespace *ns = to_time_ns(new);
+       int err;
 
        if (!current_is_single_threaded())
                return -EUSERS;
@@ -291,6 +292,10 @@ static int timens_install(struct nsproxy *nsproxy, struct ns_common *new)
 
        timens_set_vvar_page(current, ns);
 
+       err = vdso_join_timens(current, ns);
+       if (err)
+               return err;
+
        get_time_ns(ns);
        put_time_ns(nsproxy->time_ns);
        nsproxy->time_ns = ns;
@@ -305,6 +310,7 @@ int timens_on_fork(struct nsproxy *nsproxy, struct task_struct *tsk)
 {
        struct ns_common *nsc = &nsproxy->time_ns_for_children->ns;
        struct time_namespace *ns = to_time_ns(nsc);
+       int err;
 
        /* create_new_namespaces() already incremented the ref counter */
        if (nsproxy->time_ns == nsproxy->time_ns_for_children)
@@ -312,6 +318,10 @@ int timens_on_fork(struct nsproxy *nsproxy, struct task_struct *tsk)
 
        timens_set_vvar_page(tsk, ns);
 
+       err = vdso_join_timens(tsk, ns);
+       if (err)
+               return err;
+
        get_time_ns(ns);
        put_time_ns(nsproxy->time_ns);
        nsproxy->time_ns = ns;