Re: [git pull] vfs patches, part 1

[Linus Torvalds]

Al? There does seem to be a leak there. 

		Linus

On Thu, 18 Jun 2009, hooanon05@xxxxxxxxxxx wrote:
> 
> Didn't you forget path_put() for the new member before returning in the
> middle of do_filp_open()?
> 
> 
> J. R. Okajima
> 
> ----------------------------------------------------------------------
> commit ccf163f67e7c4bf3890010a5a593eb62c3004a6a
> Author: J. R. Okajima <hooanon05@xxxxxxxxxxx>
> Date:   Thu Jun 18 23:26:34 2009 +0900
> 
>     vfs: nd->root in do_filp_open()
>     
>     commit 2a737871108de9ba8930f7650d549f1383767f8b
>     "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@xxxxxxxxxxx>
> 
> diff --git a/fs/namei.c b/fs/namei.c
> index 527119a..5b961eb 100644
> --- a/fs/namei.c
> +++ b/fs/namei.c
> @@ -1698,8 +1698,11 @@ struct file *do_filp_open(int dfd, const char *pathname,
>  	if (error)
>  		return ERR_PTR(error);
>  	error = path_walk(pathname, &nd);
> -	if (error)
> +	if (error) {
> +		if (nd.root.mnt)
> +			path_put(&nd.root);
>  		return ERR_PTR(error);
> +	}
>  	if (unlikely(!audit_dummy_context()))
>  		audit_inode(pathname, nd.path.dentry);
>  
> @@ -1759,6 +1762,8 @@ do_last:
>  		}
>  		filp = nameidata_to_filp(&nd, open_flag);
>  		mnt_drop_write(nd.path.mnt);
> +		if (nd.root.mnt)
> +			path_put(&nd.root);
>  		return filp;
>  	}
>  
> @@ -1819,6 +1824,8 @@ ok:
>  	 */
>  	if (will_write)
>  		mnt_drop_write(nd.path.mnt);
> +	if (nd.root.mnt)
> +		path_put(&nd.root);
>  	return filp;
>  
>  exit_mutex_unlock:
> @@ -1859,6 +1866,8 @@ do_link:
>  		 * with "intent.open".
>  		 */
>  		release_open_intent(&nd);
> +		if (nd.root.mnt)
> +			path_put(&nd.root);
>  		return ERR_PTR(error);
>  	}
>  	nd.flags &= ~LOOKUP_PARENT;
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/