mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 02:30:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

proc: Use nd_jump_link in proc_ns_follow_link

Browse source 
Update proc_ns_follow_link to use nd_jump_link instead of just
manually updating nd.path.dentry.

This fixes the BUG_ON(nd->inode != parent->d_inode) reported by Dave
Jones and reproduced trivially with mkdir /proc/self/ns/uts/a.

Sigh it looks like the VFS change to require use of nd_jump_link
happend while proc_ns_follow_link was baking and since the common case
of proc_ns_follow_link continued to work without problems the need for
making this change was overlooked.

Cc: stable@vger.kernel.org
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
This commit is contained in:
Eric W. Biederman 2013-03-09 00:14:45 -08:00
parent 9141770548
commit db04dc679b
1 changed files with 6 additions and 6 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

12
fs/proc/namespaces.c
View file

@ -118,7 +118,7 @@ static void *proc_ns_follow_link(struct dentry *dentry, struct nameidata *nd)
struct super_block *sb = inode->i_sb; struct super_block *sb = inode->i_sb;
struct proc_inode *ei = PROC_I(inode); struct proc_inode *ei = PROC_I(inode);
struct task_struct *task; struct task_struct *task;
struct dentry *ns_dentry; struct path ns_path;
void *error = ERR_PTR(-EACCES); void *error = ERR_PTR(-EACCES);
task = get_proc_task(inode); task = get_proc_task(inode);
@ -128,14 +128,14 @@ static void *proc_ns_follow_link(struct dentry *dentry, struct nameidata *nd)
if (!ptrace_may_access(task, PTRACE_MODE_READ)) if (!ptrace_may_access(task, PTRACE_MODE_READ))
goto out_put_task; goto out_put_task;
ns_dentry = proc_ns_get_dentry(sb, task, ei->ns_ops); ns_path.dentry = proc_ns_get_dentry(sb, task, ei->ns_ops);
if (IS_ERR(ns_dentry)) { if (IS_ERR(ns_path.dentry)) {
error = ERR_CAST(ns_dentry); error = ERR_CAST(ns_path.dentry);
goto out_put_task; goto out_put_task;
} }
dput(nd->path.dentry); ns_path.mnt = mntget(nd->path.mnt);
nd->path.dentry = ns_dentry; nd_jump_link(nd, &ns_path);
error = NULL; error = NULL;
out_put_task: out_put_task: