[PATCH 1/1] ovl: Put upperdentry if ovl_check_origin() fails

[PATCH 1/1] ovl: Put upperdentry if ovl_check_origin() fails

[Vivek Goyal]

If ovl_check_origin() fails, we should put upperdentry. We have a reference
on it by now. So goto out_put_upper instead of out.

Fixes: a9d019573e88 ("ovl: lookup non-dir copy-up-origin by file handle")
Cc: <stable@vger.kernel.org> #4.12
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
---
 fs/overlayfs/namei.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/overlayfs/namei.c b/fs/overlayfs/namei.c
index a12dc10bf726..bc6d5c5a3443 100644
--- a/fs/overlayfs/namei.c
+++ b/fs/overlayfs/namei.c
@@ -630,7 +630,7 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,
 			err = ovl_check_origin(upperdentry, roe->lowerstack,
 					       roe->numlower, &stack, &ctr);
 			if (err)
-				goto out;
+				goto out_put_upper;
 		}
 
 		if (d.redirect) {
-- 
2.13.6

Re: [PATCH 1/1] ovl: Put upperdentry if ovl_check_origin() fails

[Vivek Goyal]

On Wed, Nov 01, 2017 at 03:37:22PM -0400, Vivek Goyal wrote:
> If ovl_check_origin() fails, we should put upperdentry. We have a reference
> on it by now. So goto out_put_upper instead of out.
> 
> Fixes: a9d019573e88 ("ovl: lookup non-dir copy-up-origin by file handle")
> Cc: <stable@vger.kernel.org> #4.12
> Signed-off-by: Vivek Goyal <vgoyal@redhat.com>

Hi Amir, Miklos,

Does this patch look fine? I think its a simple bug fix and should go
in 4.15.

Vivek
> ---
>  fs/overlayfs/namei.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/fs/overlayfs/namei.c b/fs/overlayfs/namei.c
> index a12dc10bf726..bc6d5c5a3443 100644
> --- a/fs/overlayfs/namei.c
> +++ b/fs/overlayfs/namei.c
> @@ -630,7 +630,7 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,
>  			err = ovl_check_origin(upperdentry, roe->lowerstack,
>  					       roe->numlower, &stack, &ctr);
>  			if (err)
> -				goto out;
> +				goto out_put_upper;
>  		}
>  
>  		if (d.redirect) {
> -- 
> 2.13.6
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-unionfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/1] ovl: Put upperdentry if ovl_check_origin() fails

[Amir Goldstein]

On Wed, Nov 8, 2017 at 4:27 PM, Vivek Goyal <vgoyal@redhat.com> wrote:
> On Wed, Nov 01, 2017 at 03:37:22PM -0400, Vivek Goyal wrote:
>> If ovl_check_origin() fails, we should put upperdentry. We have a reference
>> on it by now. So goto out_put_upper instead of out.
>>
>> Fixes: a9d019573e88 ("ovl: lookup non-dir copy-up-origin by file handle")
>> Cc: <stable@vger.kernel.org> #4.12
>> Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
>
> Hi Amir, Miklos,
>
> Does this patch look fine? I think its a simple bug fix and should go
> in 4.15.
>


Agreed.

Amir.

Re: [PATCH 1/1] ovl: Put upperdentry if ovl_check_origin() fails

[Miklos Szeredi]

On Wed, Nov 8, 2017 at 4:11 PM, Amir Goldstein <amir73il@gmail.com> wrote:
> On Wed, Nov 8, 2017 at 4:27 PM, Vivek Goyal <vgoyal@redhat.com> wrote:
>> On Wed, Nov 01, 2017 at 03:37:22PM -0400, Vivek Goyal wrote:
>>> If ovl_check_origin() fails, we should put upperdentry. We have a reference
>>> on it by now. So goto out_put_upper instead of out.
>>>
>>> Fixes: a9d019573e88 ("ovl: lookup non-dir copy-up-origin by file handle")
>>> Cc: <stable@vger.kernel.org> #4.12
>>> Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
>>
>> Hi Amir, Miklos,
>>
>> Does this patch look fine? I think its a simple bug fix and should go
>> in 4.15.
>>

Thanks, applied.

Miklos