[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <a91486e6-83ae-43b0-8d62-84dd526bd916@huawei.com>
Date: Thu, 15 May 2025 11:09:41 +0800
From: Hongbo Li <lihongbo22@...wei.com>
To: Sheng Yong <shengyong2021@...il.com>, <xiang@...nel.org>,
<hsiangkao@...ux.alibaba.com>, <chao@...nel.org>, <zbestahu@...il.com>,
<jefflexu@...ux.alibaba.com>, <dhavale@...gle.com>
CC: <linux-erofs@...ts.ozlabs.org>, <linux-kernel@...r.kernel.org>, Sheng Yong
<shengyong1@...omi.com>
Subject: Re: [PATCH v2] erofs: avoid using multiple devices with different
type
On 2025/5/15 9:48, Sheng Yong wrote:
> From: Sheng Yong <shengyong1@...omi.com>
>
> For multiple devices, both primary and extra devices should be the
> same type. `erofs_init_device` has already guaranteed that if the
> primary is a file-backed device, extra devices should also be
> regular files.
>
> However, if the primary is a block device while the extra device
> is a file-backed device, `erofs_init_device` will get an ENOTBLK,
> which is not treated as an error in `erofs_fc_get_tree`, and that
> leads to an UAF:
>
> erofs_fc_get_tree
> get_tree_bdev_flags(erofs_fc_fill_super)
> erofs_read_superblock
> erofs_init_device // sbi->dif0 is not inited yet,
> // return -ENOTBLK
> deactivate_locked_super
> free(sbi)
> if (err is -ENOTBLK)
> sbi->dif0.file = filp_open() // sbi UAF
>
> So if -ENOTBLK is hitted in `erofs_init_device`, it means the
> primary device must be a block device, and the extra device
> is not a block device. The error can be converted to -EINVAL.
>
> Fixes: fb176750266a ("erofs: add file-backed mount support")
> Signed-off-by: Sheng Yong <shengyong1@...omi.com>
> ---
> fs/erofs/super.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/fs/erofs/super.c b/fs/erofs/super.c
> index 512877d7d855..6b998a49b61e 100644
> --- a/fs/erofs/super.c
> +++ b/fs/erofs/super.c
> @@ -165,8 +165,11 @@ static int erofs_init_device(struct erofs_buf *buf, struct super_block *sb,
> filp_open(dif->path, O_RDONLY | O_LARGEFILE, 0) :
> bdev_file_open_by_path(dif->path,
> BLK_OPEN_READ, sb->s_type, NULL);
> - if (IS_ERR(file))
> + if (IS_ERR(file)) {
> + if (file == ERR_PTR(-ENOTBLK))
> + return -EINVAL;
> return PTR_ERR(file);
> + }
Reviewed-by: Hongbo Li <lihongbo22@...wei.com>
Thanks,
Hongbo
>
> if (!erofs_is_fileio_mode(sbi)) {
> dif->dax_dev = fs_dax_get_by_bdev(file_bdev(file),
Powered by blists - more mailing lists