summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2024-02-12 22:44:11 -0500
committerSasha Levin <sashal@kernel.org>2024-03-26 18:18:26 -0400
commit9337fc461c187aabf36c634ec3996959a7ef3493 (patch)
tree28aa98bcd6c910713b53fcfe58016f22bdd778c9 /fs
parent3dd9bef2b8bd6a0d519138280e245825912a17d8 (diff)
downloadlinux-stable-9337fc461c187aabf36c634ec3996959a7ef3493.tar.gz
linux-stable-9337fc461c187aabf36c634ec3996959a7ef3493.tar.bz2
linux-stable-9337fc461c187aabf36c634ec3996959a7ef3493.zip
erofs: fix handling kern_mount() failure
[ Upstream commit 2c88c16dc20e88dd54d2f6f4d01ae1dce6cc9654 ] if you have a variable that holds NULL or a pointer to live struct mount, do not shove ERR_PTR() into it - not if you later treat "not NULL" as "holds a pointer to object". Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Stable-dep-of: 0f28be64d132 ("erofs: fix lockdep false positives on initializing erofs_pseudo_mnt") Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/erofs/fscache.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/erofs/fscache.c b/fs/erofs/fscache.c
index 87ff35bff8d5..1052f75d1dfa 100644
--- a/fs/erofs/fscache.c
+++ b/fs/erofs/fscache.c
@@ -381,11 +381,12 @@ static int erofs_fscache_init_domain(struct super_block *sb)
goto out;
if (!erofs_pseudo_mnt) {
- erofs_pseudo_mnt = kern_mount(&erofs_fs_type);
- if (IS_ERR(erofs_pseudo_mnt)) {
- err = PTR_ERR(erofs_pseudo_mnt);
+ struct vfsmount *mnt = kern_mount(&erofs_fs_type);
+ if (IS_ERR(mnt)) {
+ err = PTR_ERR(mnt);
goto out;
}
+ erofs_pseudo_mnt = mnt;
}
domain->volume = sbi->volume;