1 files changed, 10 insertions, 2 deletions

diff --git a/fs/proc/base.c b/fs/proc/base.c
index 8a19a8a1a3e6..75b1979749a5 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -2101,15 +2101,23 @@ static const struct file_operations proc_coredump_filter_operations = {
 static int proc_self_readlink(struct dentry *dentry, char __user *buffer,
                               int buflen)
 {
+        struct pid_namespace *ns = dentry->d_sb->s_fs_info;
+        pid_t tgid = task_tgid_nr_ns(current, ns);
         char tmp[PROC_NUMBUF];
-        sprintf(tmp, "%d", task_tgid_vnr(current));
+        if (!tgid)
+                return -ENOENT;
+        sprintf(tmp, "%d", tgid);
         return vfs_readlink(dentry,buffer,buflen,tmp);
 }
 
 static void *proc_self_follow_link(struct dentry *dentry, struct nameidata *nd)
 {
+        struct pid_namespace *ns = dentry->d_sb->s_fs_info;
+        pid_t tgid = task_tgid_nr_ns(current, ns);
         char tmp[PROC_NUMBUF];
-        sprintf(tmp, "%d", task_tgid_vnr(current));
+        if (!tgid)
+                return ERR_PTR(-ENOENT);
+        sprintf(tmp, "%d", task_tgid_nr_ns(current, ns));
         return ERR_PTR(vfs_follow_link(nd,tmp));
 }