Skip to content

Commit 2896900

Browse files
ChristianKoenigAMDtorvalds
authored andcommitted
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: 1527f92 ("mm: mmap: fix fput in error path v2") Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> 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> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent 9da29c7 commit 2896900

1 file changed

Lines changed: 1 addition & 10 deletions

File tree

fs/overlayfs/file.c

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -430,20 +430,11 @@ static int ovl_mmap(struct file *file, struct vm_area_struct *vma)
430430
if (WARN_ON(file != vma->vm_file))
431431
return -EIO;
432432

433-
vma->vm_file = get_file(realfile);
433+
vma_set_file(vma, realfile);
434434

435435
old_cred = ovl_override_creds(file_inode(file)->i_sb);
436436
ret = call_mmap(vma->vm_file, vma);
437437
revert_creds(old_cred);
438-
439-
if (ret) {
440-
/* Drop reference count from new vm_file value */
441-
fput(realfile);
442-
} else {
443-
/* Drop reference count from previous vm_file value */
444-
fput(file);
445-
}
446-
447438
ovl_file_accessed(file);
448439

449440
return ret;

0 commit comments

Comments
 (0)