From a85c32c0a24a8b197bffec6bbf17fb48484f2c2b Mon Sep 17 00:00:00 2001 From: "Eric W. Biederman" Date: Fri, 8 Feb 2008 04:18:34 -0800 Subject: [PATCH] --- yaml --- r: 84617 b: refs/heads/master c: 488e5bc4560d0b510c1ddc451c51a6cc14e3a930 h: refs/heads/master i: 84615: fade416e8500252a5bdcc34af623d3a1e7ab3549 v: v3 --- [refs] | 2 +- trunk/fs/proc/base.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4faaaff77ef4..194c95c05860 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: df5f8314ca30d6a76735748e5ba4ca9809c0f434 +refs/heads/master: 488e5bc4560d0b510c1ddc451c51a6cc14e3a930 diff --git a/trunk/fs/proc/base.c b/trunk/fs/proc/base.c index 8a19a8a1a3e6..75b1979749a5 100644 --- a/trunk/fs/proc/base.c +++ b/trunk/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)); }