1 files changed, 6 insertions, 4 deletions

diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
index 85b62691f4f2..7c6b51a58968 100644
--- a/net/core/net_namespace.c
+++ b/net/core/net_namespace.c
@@ -373,9 +373,11 @@ struct net *get_net_ns_by_pid(pid_t pid)
         tsk = find_task_by_vpid(pid);
         if (tsk) {
                 struct nsproxy *nsproxy;
-                nsproxy = task_nsproxy(tsk);
+                task_lock(tsk);
+                nsproxy = tsk->nsproxy;
                 if (nsproxy)
                         net = get_net(nsproxy->net_ns);
+                task_unlock(tsk);
         }
         rcu_read_unlock();
         return net;
@@ -632,11 +634,11 @@ static void *netns_get(struct task_struct *task)
         struct net *net = NULL;
         struct nsproxy *nsproxy;
 
-        rcu_read_lock();
-        nsproxy = task_nsproxy(task);
+        task_lock(task);
+        nsproxy = task->nsproxy;
         if (nsproxy)
                 net = get_net(nsproxy->net_ns);
-        rcu_read_unlock();
+        task_unlock(task);
 
         return net;
 }