revert "proc: fix the threaded proc self"
Revert commit c6caeb7c45
("proc: fix the
threaded /proc/self"), since Eric says "The patch really is wrong.
There is at least one corner case in procps that cares."
Cc: Eric W. Biederman <ebiederm@xmission.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "Guillaume Chazarain" <guichaz@yahoo.fr>
Cc: "Pavel Emelyanov" <xemul@openvz.org>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Oleg Nesterov <oleg@tv-sign.ru>
Cc: Roland McGrath <roland@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
0cf975e169
commit
b55fcb22d4
|
@ -2102,22 +2102,22 @@ 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 pid = task_pid_nr_ns(current, ns);
|
||||
pid_t tgid = task_tgid_nr_ns(current, ns);
|
||||
char tmp[PROC_NUMBUF];
|
||||
if (!pid)
|
||||
if (!tgid)
|
||||
return -ENOENT;
|
||||
sprintf(tmp, "%d", pid);
|
||||
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 pid = task_pid_nr_ns(current, ns);
|
||||
pid_t tgid = task_tgid_nr_ns(current, ns);
|
||||
char tmp[PROC_NUMBUF];
|
||||
if (!pid)
|
||||
if (!tgid)
|
||||
return ERR_PTR(-ENOENT);
|
||||
sprintf(tmp, "%d", pid);
|
||||
sprintf(tmp, "%d", task_tgid_nr_ns(current, ns));
|
||||
return ERR_PTR(vfs_follow_link(nd,tmp));
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue