2 files changed, 13 insertions, 19 deletions

diff --git a/fs/ecryptfs/messaging.c b/fs/ecryptfs/messaging.c
index e0b0a4e28b9b..6913f727624d 100644
--- a/fs/ecryptfs/messaging.c
+++ b/fs/ecryptfs/messaging.c
@@ -360,7 +360,7 @@ int ecryptfs_process_response(struct ecryptfs_message *msg, uid_t euid,
         struct ecryptfs_msg_ctx *msg_ctx;
         size_t msg_size;
         struct nsproxy *nsproxy;
-        struct user_namespace *current_user_ns;
+        struct user_namespace *tsk_user_ns;
         uid_t ctx_euid;
         int rc;
 
@@ -385,9 +385,9 @@ int ecryptfs_process_response(struct ecryptfs_message *msg, uid_t euid,
                 mutex_unlock(&ecryptfs_daemon_hash_mux);
                 goto wake_up;
         }
-        current_user_ns = nsproxy->user_ns;
+        tsk_user_ns = __task_cred(msg_ctx->task)->user->user_ns;
         ctx_euid = task_euid(msg_ctx->task);
-        rc = ecryptfs_find_daemon_by_euid(&daemon, ctx_euid, current_user_ns);
+        rc = ecryptfs_find_daemon_by_euid(&daemon, ctx_euid, tsk_user_ns);
         rcu_read_unlock();
         mutex_unlock(&ecryptfs_daemon_hash_mux);
         if (rc) {
@@ -405,11 +405,11 @@ int ecryptfs_process_response(struct ecryptfs_message *msg, uid_t euid,
                        euid, ctx_euid);
                 goto unlock;
         }
-        if (current_user_ns != user_ns) {
+        if (tsk_user_ns != user_ns) {
                 rc = -EBADMSG;
                 printk(KERN_WARNING "%s: Received message from user_ns "
                        "[0x%p]; expected message from user_ns [0x%p]\n",
-                       __func__, user_ns, nsproxy->user_ns);
+                       __func__, user_ns, tsk_user_ns);
                 goto unlock;
         }
         if (daemon->pid != pid) {
@@ -468,8 +468,7 @@ ecryptfs_send_message_locked(char *data, int data_len, u8 msg_type,
         uid_t euid = current_euid();
         int rc;
 
-        rc = ecryptfs_find_daemon_by_euid(&daemon, euid,
-                                          current->nsproxy->user_ns);
+        rc = ecryptfs_find_daemon_by_euid(&daemon, euid, current_user_ns());
         if (rc || !daemon) {
                 rc = -ENOTCONN;
                 printk(KERN_ERR "%s: User [%d] does not have a daemon "
diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c
index 047ac609695b..efd95a0ed1ea 100644
--- a/fs/ecryptfs/miscdev.c
+++ b/fs/ecryptfs/miscdev.c
@@ -47,8 +47,7 @@ ecryptfs_miscdev_poll(struct file *file, poll_table *pt)
 
         mutex_lock(&ecryptfs_daemon_hash_mux);
         /* TODO: Just use file->private_data? */
-        rc = ecryptfs_find_daemon_by_euid(&daemon, euid,
-                                          current->nsproxy->user_ns);
+        rc = ecryptfs_find_daemon_by_euid(&daemon, euid, current_user_ns());
         BUG_ON(rc || !daemon);
         mutex_lock(&daemon->mux);
         mutex_unlock(&ecryptfs_daemon_hash_mux);
@@ -95,11 +94,9 @@ ecryptfs_miscdev_open(struct inode *inode, struct file *file)
                        "count; rc = [%d]\n", __func__, rc);
                 goto out_unlock_daemon_list;
         }
-        rc = ecryptfs_find_daemon_by_euid(&daemon, euid,
-                                          current->nsproxy->user_ns);
+        rc = ecryptfs_find_daemon_by_euid(&daemon, euid, current_user_ns());
         if (rc || !daemon) {
-                rc = ecryptfs_spawn_daemon(&daemon, euid,
-                                           current->nsproxy->user_ns,
+                rc = ecryptfs_spawn_daemon(&daemon, euid, current_user_ns(),
                                            task_pid(current));
                 if (rc) {
                         printk(KERN_ERR "%s: Error attempting to spawn daemon; "
@@ -153,8 +150,7 @@ ecryptfs_miscdev_release(struct inode *inode, struct file *file)
         int rc;
 
         mutex_lock(&ecryptfs_daemon_hash_mux);
-        rc = ecryptfs_find_daemon_by_euid(&daemon, euid,
-                                          current->nsproxy->user_ns);
+        rc = ecryptfs_find_daemon_by_euid(&daemon, euid, current_user_ns());
         BUG_ON(rc || !daemon);
         mutex_lock(&daemon->mux);
         BUG_ON(daemon->pid != task_pid(current));
@@ -254,8 +250,7 @@ ecryptfs_miscdev_read(struct file *file, char __user *buf, size_t count,
 
         mutex_lock(&ecryptfs_daemon_hash_mux);
         /* TODO: Just use file->private_data? */
-        rc = ecryptfs_find_daemon_by_euid(&daemon, euid,
-                                          current->nsproxy->user_ns);
+        rc = ecryptfs_find_daemon_by_euid(&daemon, euid, current_user_ns());
         BUG_ON(rc || !daemon);
         mutex_lock(&daemon->mux);
         if (daemon->flags & ECRYPTFS_DAEMON_ZOMBIE) {
@@ -295,7 +290,7 @@ check_list:
                 goto check_list;
         }
         BUG_ON(euid != daemon->euid);
-        BUG_ON(current->nsproxy->user_ns != daemon->user_ns);
+        BUG_ON(current_user_ns() != daemon->user_ns);
         BUG_ON(task_pid(current) != daemon->pid);
         msg_ctx = list_first_entry(&daemon->msg_ctx_out_queue,
                                    struct ecryptfs_msg_ctx, daemon_out_list);
@@ -468,7 +463,7 @@ ecryptfs_miscdev_write(struct file *file, const char __user *buf,
                         goto out_free;
                 }
                 rc = ecryptfs_miscdev_response(&data[i], packet_size,
-                                               euid, current->nsproxy->user_ns,
+                                               euid, current_user_ns(),
                                                task_pid(current), seq);
                 if (rc)
                         printk(KERN_WARNING "%s: Failed to deliver miscdev "