mm-commits.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* + ovl-fix-reference-counting-in-ovl_mmap-error-path.patch added to -mm tree
@ 2021-04-22  3:43 akpm
  0 siblings, 0 replies; only message in thread
From: akpm @ 2021-04-22  3:43 UTC (permalink / raw)
  To: christian.koenig, jaharkes, jgg, miklos, mm-commits, stable


The patch titled
     Subject: ovl: fix reference counting in ovl_mmap error path
has been added to the -mm tree.  Its filename is
     ovl-fix-reference-counting-in-ovl_mmap-error-path.patch

This patch should soon appear at
    https://ozlabs.org/~akpm/mmots/broken-out/ovl-fix-reference-counting-in-ovl_mmap-error-path.patch
and later at
    https://ozlabs.org/~akpm/mmotm/broken-out/ovl-fix-reference-counting-in-ovl_mmap-error-path.patch

Before you just go and hit "reply", please:
   a) Consider who else should be cc'ed
   b) Prefer to cc a suitable mailing list as well
   c) Ideally: find the original patch on the mailing list and do a
      reply-to-all to that, adding suitable additional cc's

*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***

The -mm tree is included into linux-next and is updated
there every 3-4 working days

------------------------------------------------------
From: Christian König <christian.koenig@amd.com>
Subject: ovl: fix reference counting in ovl_mmap error path

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.

Link: https://lkml.kernel.org/r/20210421132012.82354-2-christian.koenig@amd.com
Fixes: 1527f926fd04 ("mm: mmap: fix fput in error path v2")
Signed-off-by: Christian König <christian.koenig@amd.com>
Cc: Jan Harkes <jaharkes@cs.cmu.edu>
Cc: Miklos Szeredi <miklos@szeredi.hu>
Cc: Jason Gunthorpe <jgg@ziepe.ca>
Cc: <stable@vger.kernel.org>	[5.11+]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 fs/overlayfs/file.c |   11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

--- a/fs/overlayfs/file.c~ovl-fix-reference-counting-in-ovl_mmap-error-path
+++ a/fs/overlayfs/file.c
@@ -430,20 +430,11 @@ static int ovl_mmap(struct file *file, s
 	if (WARN_ON(file != vma->vm_file))
 		return -EIO;
 
-	vma->vm_file = get_file(realfile);
+	vma_set_file(vma, realfile);
 
 	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;
_

Patches currently in -mm which might be from christian.koenig@amd.com are

coda-fix-reference-counting-in-coda_file_mmap-error-path.patch
ovl-fix-reference-counting-in-ovl_mmap-error-path.patch


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2021-04-22  3:43 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-22  3:43 + ovl-fix-reference-counting-in-ovl_mmap-error-path.patch added to -mm tree akpm

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).