Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Thu, 22 Apr 2021 10:13:35 +0200
From:   Daniel Vetter <daniel@ffwll.ch>
To:     Christian =?iso-8859-1?Q?K=F6nig?= 
        <ckoenig.leichtzumerken@gmail.com>
Cc:     linux-kernel@vger.kernel.org, linux-unionfs@vger.kernel.org,
        codalist@coda.cs.cmu.edu, dri-devel@lists.freedesktop.org,
        jgg@ziepe.ca, jaharkes@cs.cmu.edu, akpm@linux-foundation.org,
        miklos@szeredi.hu, coda@cs.cmu.edu
Subject: Re: [PATCH 2/2] ovl: fix reference counting in ovl_mmap error path
Message-ID: <YIEwL09isbCIM82+@phenom.ffwll.local>
Mail-Followup-To: Christian =?iso-8859-1?Q?K=F6nig?= <ckoenig.leichtzumerken@gmail.com>,
        linux-kernel@vger.kernel.org, linux-unionfs@vger.kernel.org,
        codalist@coda.cs.cmu.edu, dri-devel@lists.freedesktop.org,
        jgg@ziepe.ca, jaharkes@cs.cmu.edu, akpm@linux-foundation.org,
        miklos@szeredi.hu, coda@cs.cmu.edu
References: <20210421132012.82354-1-christian.koenig@amd.com>
 <20210421132012.82354-2-christian.koenig@amd.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <20210421132012.82354-2-christian.koenig@amd.com>
Precedence: bulk

On Wed, Apr 21, 2021 at 03:20:12PM +0200, Christian K?nig wrote:
> mmap_region() now calls fput() on the vma->vm_file.
> 
> Fix this by using vma_set_file() so it doesn't need to be
> handled manually here any more.
> 
> Signed-off-by: Christian K?nig <christian.koenig@amd.com>
> Fixes: 1527f926fd04 ("mm: mmap: fix fput in error path v2")
> CC: stable@vger.kernel.org # 5.11+
> ---
>  fs/overlayfs/file.c | 11 +----------
>  1 file changed, 1 insertion(+), 10 deletions(-)
> 
> diff --git a/fs/overlayfs/file.c b/fs/overlayfs/file.c
> index dbfb35fb0ff7..3847cdc069b5 100644
> --- a/fs/overlayfs/file.c
> +++ b/fs/overlayfs/file.c
> @@ -430,20 +430,11 @@ static int ovl_mmap(struct file *file, struct vm_area_struct *vma)
>  	if (WARN_ON(file != vma->vm_file))
>  		return -EIO;
>  
> -	vma->vm_file = get_file(realfile);
> +	vma_set_file(vma, realfile);

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>

>  
>  	old_cred = ovl_override_creds(file_inode(file)->i_sb);
>  	ret = call_mmap(vma->vm_file, vma);
>  	revert_creds(old_cred);
> -
> -	if (ret) {
> -		/* Drop reference count from new vm_file value */
> -		fput(realfile);
> -	} else {
> -		/* Drop reference count from previous vm_file value */
> -		fput(file);
> -	}
> -
>  	ovl_file_accessed(file);
>  
>  	return ret;
> -- 
> 2.25.1
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch