From: Daniel Vetter <daniel@ffwll.ch>
To: "Christian König" <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
Date: Thu, 22 Apr 2021 10:13:35 +0200 [thread overview]
Message-ID: <YIEwL09isbCIM82+@phenom.ffwll.local> (raw)
In-Reply-To: <20210421132012.82354-2-christian.koenig@amd.com>
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
next prev parent reply other threads:[~2021-04-22 8:13 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-21 13:20 [PATCH 1/2] coda: fix reference counting in coda_file_mmap error path Christian König
2021-04-21 13:20 ` [PATCH 2/2] ovl: fix reference counting in ovl_mmap " Christian König
2021-04-22 8:13 ` Daniel Vetter [this message]
2021-04-22 8:11 ` [PATCH 1/2] coda: fix reference counting in coda_file_mmap " Daniel Vetter
2021-04-22 12:27 ` Jan Harkes
2021-04-22 12:39 ` Christian König
2021-04-22 13:51 ` Jan Harkes
2021-04-23 8:10 ` Christian König
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YIEwL09isbCIM82+@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=akpm@linux-foundation.org \
--cc=ckoenig.leichtzumerken@gmail.com \
--cc=coda@cs.cmu.edu \
--cc=codalist@coda.cs.cmu.edu \
--cc=dri-devel@lists.freedesktop.org \
--cc=jaharkes@cs.cmu.edu \
--cc=jgg@ziepe.ca \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-unionfs@vger.kernel.org \
--cc=miklos@szeredi.hu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).