linux-kernel - [PATCH 2/2] ovl: fix reference counting in ovl

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20210421132012.82354-2-christian.koenig@amd.com>
Date:   Wed, 21 Apr 2021 15:20:12 +0200
From:   "Christian König" 
        <ckoenig.leichtzumerken@...il.com>
To:     linux-kernel@...r.kernel.org, linux-unionfs@...r.kernel.org,
        codalist@...a.cs.cmu.edu, dri-devel@...ts.freedesktop.org
Cc:     jaharkes@...cmu.edu, coda@...cmu.edu, miklos@...redi.hu,
        akpm@...ux-foundation.org, jgg@...pe.ca
Subject: [PATCH 2/2] 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.

Signed-off-by: Christian König <christian.koenig@....com>
Fixes: 1527f926fd04 ("mm: mmap: fix fput in error path v2")
CC: stable@...r.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);
 
 	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