[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <4ccd8b01-24ae-87de-3cfa-bf99a8bb6b3b@sandeen.net>
Date: Thu, 25 Aug 2022 14:45:25 -0500
From: Eric Sandeen <sandeen@...deen.net>
To: Dongliang Mu <dzm91@...t.edu.cn>,
Alexander Viro <viro@...iv.linux.org.uk>
Cc: Dongliang Mu <mudongliangabcd@...il.com>,
butt3rflyh4ck <butterflyhuangxx@...il.com>,
Hao Sun <sunhao.th@...il.com>, Jiacheng Xu <stitch@....edu.cn>,
stable@...r.kernel.org, linux-fsdevel@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: Re: [PATCH v2] fs: fix UAF/GPF bug in nilfs_mdt_destroy
On 8/15/22 11:08 PM, Dongliang Mu wrote:
> From: Dongliang Mu <mudongliangabcd@...il.com>
>
> 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@...il.com>
> Reported-by: Hao Sun <sunhao.th@...il.com>
> Reported-by: Jiacheng Xu <stitch@....edu.cn>
> Signed-off-by: Dongliang Mu <mudongliangabcd@...il.com>
> Cc: Al Viro <viro@...iv.linux.org.uk>
> Cc: stable@...r.kernel.org
> ---
> v1->v2: move security_inode_alloc at the very end according to Al Viro
> other than initializing i_private before security_inode_alloc.
> fs/inode.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/fs/inode.c b/fs/inode.c
> index 6462276dfdf0..49d1eb91728c 100644
> --- a/fs/inode.c
> +++ b/fs/inode.c
> @@ -192,8 +192,6 @@ int inode_init_always(struct super_block *sb, struct inode *inode)
> inode->i_wb_frn_history = 0;
> #endif
>
> - if (security_inode_alloc(inode))
> - goto out;
> spin_lock_init(&inode->i_lock);
> lockdep_set_class(&inode->i_lock, &sb->s_type->i_lock_key);
>
> @@ -228,6 +226,9 @@ int inode_init_always(struct super_block *sb, struct inode *inode)
> inode->i_fsnotify_mask = 0;
> #endif
> inode->i_flctx = NULL;
> +
> + if (security_inode_alloc(inode))
> + goto out;
Seems like the out: label could be removed, and simply return -ENOMEM directly here,
but that's just a nitpick.
-Eric
> this_cpu_inc(nr_inodes);
>
> return 0;
Powered by blists - more mailing lists