evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

vfs: fix nd->root leak in do_filp_open()

Browse source 
commit 2a73787110 "Cache root in nameidata"
introduced a new member nd->root, but forgot to put it in do_filp_open().

Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
J. R. Okajima 2009-06-18 23:30:15 +09:00 • committed by Al Viro
parent b5450d9c84
commit 654f562c52
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
fs/namei.c
View file

@ -1698,8 +1698,11 @@ struct file *do_filp_open(int dfd, const char *pathname,
if (error) if (error)
return ERR_PTR(error); return ERR_PTR(error);
error = path_walk(pathname, &nd); error = path_walk(pathname, &nd);
if (error) if (error) {
if (nd.root.mnt)
path_put(&nd.root);
return ERR_PTR(error); return ERR_PTR(error);
}
if (unlikely(!audit_dummy_context())) if (unlikely(!audit_dummy_context()))
audit_inode(pathname, nd.path.dentry); audit_inode(pathname, nd.path.dentry);
@ -1759,6 +1762,8 @@ do_last:
} }
filp = nameidata_to_filp(&nd, open_flag); filp = nameidata_to_filp(&nd, open_flag);
mnt_drop_write(nd.path.mnt); mnt_drop_write(nd.path.mnt);
if (nd.root.mnt)
path_put(&nd.root);
return filp; return filp;
} }
@ -1819,6 +1824,8 @@ ok:
*/ */
if (will_write) if (will_write)
mnt_drop_write(nd.path.mnt); mnt_drop_write(nd.path.mnt);
if (nd.root.mnt)
path_put(&nd.root);
return filp; return filp;
exit_mutex_unlock: exit_mutex_unlock:
@ -1859,6 +1866,8 @@ do_link:
* with "intent.open". * with "intent.open".
*/ */
release_open_intent(&nd); release_open_intent(&nd);
if (nd.root.mnt)
path_put(&nd.root);
return ERR_PTR(error); return ERR_PTR(error);
} }
nd.flags &= ~LOOKUP_PARENT; nd.flags &= ~LOOKUP_PARENT;