Skip to content

Commit 6a86879

Browse files
fs: fix UAF/GPF bug in nilfs_mdt_destroy
jira VULN-155287 cve CVE-2022-50367 commit-author Dongliang Mu <mudongliangabcd@gmail.com> commit 2e488f1 In alloc_inode, inode_init_always() could return -ENOMEM if security_inode_alloc() fails, which causes inode->i_private uninitialized. Then nilfs_is_metadata_file_inode() returns true and nilfs_free_inode() wrongly calls nilfs_mdt_destroy(), which frees the uninitialized inode->i_private and leads to crashes(e.g., UAF/GPF). Fix this by moving security_inode_alloc just prior to this_cpu_inc(nr_inodes) Link: https://lkml.kernel.org/r/CAFcO6XOcf1Jj2SeGt=jJV59wmhESeSKpfR0omdFRq+J9nD1vfQ@mail.gmail.com Reported-by: butt3rflyh4ck <butterflyhuangxx@gmail.com> Reported-by: Hao Sun <sunhao.th@gmail.com> Reported-by: Jiacheng Xu <stitch@zju.edu.cn> Reviewed-by: Christian Brauner (Microsoft) <brauner@kernel.org> Signed-off-by: Dongliang Mu <mudongliangabcd@gmail.com> Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: stable@vger.kernel.org Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> (cherry picked from commit 2e488f1) Signed-off-by: Shreeya Patel <spatel@ciq.com>
1 parent b54a0c1 commit 6a86879

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

fs/inode.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,6 @@ int inode_init_always(struct super_block *sb, struct inode *inode)
167167
inode->i_wb_frn_history = 0;
168168
#endif
169169

170-
if (security_inode_alloc(inode))
171-
goto out;
172170
spin_lock_init(&inode->i_lock);
173171
lockdep_set_class(&inode->i_lock, &sb->s_type->i_lock_key);
174172

@@ -203,11 +201,12 @@ int inode_init_always(struct super_block *sb, struct inode *inode)
203201
inode->i_fsnotify_mask = 0;
204202
#endif
205203
inode->i_flctx = NULL;
204+
205+
if (unlikely(security_inode_alloc(inode)))
206+
return -ENOMEM;
206207
this_cpu_inc(nr_inodes);
207208

208209
return 0;
209-
out:
210-
return -ENOMEM;
211210
}
212211
EXPORT_SYMBOL(inode_init_always);
213212

0 commit comments

Comments
 (0)