2 files changed, 6 insertions, 4 deletions

diff --git a/net/core/scm.c b/net/core/scm.c
index 530bee8d9ed9..100ba6d9d478 100644
--- a/net/core/scm.c
+++ b/net/core/scm.c
@@ -24,6 +24,8 @@
 #include <linux/interrupt.h>
 #include <linux/netdevice.h>
 #include <linux/security.h>
+#include <linux/pid.h>
+#include <linux/nsproxy.h>
 
 #include <asm/system.h>
 #include <asm/uaccess.h>
@@ -42,7 +44,7 @@
 
 static __inline__ int scm_check_creds(struct ucred *creds)
 {
-        if ((creds->pid == current->tgid || capable(CAP_SYS_ADMIN)) &&
+        if ((creds->pid == task_tgid_vnr(current) || capable(CAP_SYS_ADMIN)) &&
             ((creds->uid == current->uid || creds->uid == current->euid ||
               creds->uid == current->suid) || capable(CAP_SETUID)) &&
             ((creds->gid == current->gid || creds->gid == current->egid ||
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 6996cba5aa96..9163ec526c2a 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -483,7 +483,7 @@ static int unix_listen(struct socket *sock, int backlog)
         sk->sk_max_ack_backlog  = backlog;
         sk->sk_state            = TCP_LISTEN;
         /* set credentials so connect can copy them */
-        sk->sk_peercred.pid     = current->tgid;
+        sk->sk_peercred.pid     = task_tgid_vnr(current);
         sk->sk_peercred.uid     = current->euid;
         sk->sk_peercred.gid     = current->egid;
         err = 0;
@@ -1133,7 +1133,7 @@ restart:
         unix_peer(newsk)        = sk;
         newsk->sk_state         = TCP_ESTABLISHED;
         newsk->sk_type          = sk->sk_type;
-        newsk->sk_peercred.pid  = current->tgid;
+        newsk->sk_peercred.pid  = task_tgid_vnr(current);
         newsk->sk_peercred.uid  = current->euid;
         newsk->sk_peercred.gid  = current->egid;
         newu = unix_sk(newsk);
@@ -1194,7 +1194,7 @@ static int unix_socketpair(struct socket *socka, struct socket *sockb)
         sock_hold(skb);
         unix_peer(ska)=skb;
         unix_peer(skb)=ska;
-        ska->sk_peercred.pid = skb->sk_peercred.pid = current->tgid;
+        ska->sk_peercred.pid = skb->sk_peercred.pid = task_tgid_vnr(current);
         ska->sk_peercred.uid = skb->sk_peercred.uid = current->euid;
         ska->sk_peercred.gid = skb->sk_peercred.gid = current->egid;