Received: by 2002:a05:6a10:c7c6:0:0:0:0 with SMTP id h6csp2650699pxy; Tue, 3 Aug 2021 11:27:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxktoPINRRxzbgGiVaS4EFc1w9MWrqM2ZRKueYpkP8ux06zQphPqYR1kqO45SXXwS3HAS/B X-Received: by 2002:a5e:8816:: with SMTP id l22mr238198ioj.100.1628015247196; Tue, 03 Aug 2021 11:27:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628015247; cv=none; d=google.com; s=arc-20160816; b=jAa6QXab/PwrSKPbKwZV/FyNvlAKEEd1HBS32KRcPyzKwUX/mfpu0hfnRSp6RoSC+l ffCg4N43zSNbeR4tdQBtUblE/udYh6NljXuPb2Ez2bYXNgpQKCF9LE1lhtQy3hR69YFU NT/MEmfI+kPaPVaw976GhWd2Yb75ImPE1avdwlZqo+xbj0Hy5G4UktFPEHiYrW/lA1cL F6tvYZ+1uLRMI0VT5IvFBVjhQoI28uvgFVf5waSoBU8b4EdFW9ZFGX/h3nyyEQPvVrZX Oj+6hBY1ICdobzYFY2gXyQF5Qc1OX9ZA4/KULbHBktpatAzuNWYIdy9lvVWt0wP5UOH5 gyOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=vGS72KD09V2H0ZJ54JoolBEA405gxU848BHm9Wah0wU=; b=x6eyIAhRYvZQQXdlLPNg1io3L/u7baOjbsBm2f4lDvgkFsYMn7M1gaoLpfKIxZAsnG O5kxwd0fTxPIBeYSuIw1qaWcpHkkSuQxzTvX092wZInndf0kZV2mmxUAfNLg3t+rNikr iSMclyXlyQzmYkT4fAeOZJNe+LCbRukrOEaualLUdbjrPKuafR9j+it/ir8sESB3bbBO SEVAWmP0u3fEr6TA+hhQuj06s4+kvcSbwWdsKYomQfMBxdO9Y6zSTT8i0BW+fTvZf0mV noWrOkqEFWMagKPz8HUgDkYtI8bXzh2704fXLtquc9i1vuIjoP6/zERqm4TQudvCYnrx xepw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=N3+SzdZC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m14si3117408ilh.147.2021.08.03.11.27.14; Tue, 03 Aug 2021 11:27:27 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=N3+SzdZC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238730AbhHCS0X (ORCPT + 99 others); Tue, 3 Aug 2021 14:26:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:35456 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238560AbhHCS0W (ORCPT ); Tue, 3 Aug 2021 14:26:22 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 07D5B60230; Tue, 3 Aug 2021 18:26:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1628015171; bh=Z3wu66Br8haK7QbPunOYYA+xem3yiGjoO3sfOEZ6hss=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=N3+SzdZCDihqKpE3FEiNNKhukCBJX0p2HIGmS1K8vOJU+3vJkOsWKU6vuKZaz6MNQ RdhWHfTUNkgNhmvcEI1LYF1bEEcteLZbTmSB5uFAXN8Ttnz3mUV4Oqi8RlU/r+jzTv WatdlBydpwKhoRw2z4olTuma05FFRHd7M4MheAjvsOabadc4yc1putBgnS6JEKvZxb VlA1pjARibstXdI3ha0kFob9av5oVBy1BJW1AVi5rvaLKuMwE1u6LyCYkyRIHM2lxP 2WzGGz+wU0bpxrKHe7WEHgRmPqPbD/UFdSgpCVelV8h8sStE3mrK4a+HDMdoxJZZNN PCcLkhBbCB0aQ== Date: Tue, 3 Aug 2021 11:26:09 -0700 From: Jaegeuk Kim To: Chao Yu Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Chao Yu Subject: Re: [PATCH] f2fs: compress: do sanity check on cluster Message-ID: References: <20210803103952.737222-1-chao@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210803103952.737222-1-chao@kernel.org> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 08/03, Chao Yu wrote: > This patch adds f2fs_sanity_check_cluster() to support doing > sanity check on cluster of compressed file, it will be triggered > from below two paths: > > - __f2fs_cluster_blocks() > - f2fs_map_blocks(F2FS_GET_BLOCK_FIEMAP) > > And it can detect below three kind of cluster insanity status. > > C: COMPRESS_ADDR > N: NULL_ADDR or NEW_ADDR > V: valid blkaddr > *: any value > > 1. [*|C|*|*] > 2. [C|*|C|*] > 3. [C|N|N|V] > > Signed-off-by: Chao Yu > --- > fs/f2fs/compress.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++ > fs/f2fs/data.c | 21 ++++++++++++------ > fs/f2fs/f2fs.h | 1 + > 3 files changed, 68 insertions(+), 7 deletions(-) > > diff --git a/fs/f2fs/compress.c b/fs/f2fs/compress.c > index 455561826c7d..4aa166d3d9bf 100644 > --- a/fs/f2fs/compress.c > +++ b/fs/f2fs/compress.c > @@ -898,6 +898,54 @@ static bool cluster_has_invalid_data(struct compress_ctx *cc) > return false; > } > > +bool f2fs_sanity_check_cluster(struct dnode_of_data *dn) > +{ > + struct f2fs_sb_info *sbi = F2FS_I_SB(dn->inode); > + unsigned int cluster_size = F2FS_I(dn->inode)->i_cluster_size; > + bool compressed = dn->data_blkaddr == COMPRESS_ADDR; > + int cluster_end = 0; > + int i; > + char *reason = ""; > + > + if (!compressed) > + return false; > + > + /* [..., COMPR_ADDR, ...] */ > + if (dn->ofs_in_node % cluster_size) { > + reason = "[*|C|*|*]"; > + goto out; > + } > + > + for (i = 1; i < cluster_size; i++) { > + block_t blkaddr = data_blkaddr(dn->inode, dn->node_page, > + dn->ofs_in_node + i); > + > + /* [COMPR_ADDR, ..., COMPR_ADDR] */ > + if (blkaddr == COMPRESS_ADDR) { > + reason = "[C|*|C|*]"; > + goto out; > + } > + if (compressed) { > + if (!__is_valid_data_blkaddr(blkaddr)) { > + if (!cluster_end) > + cluster_end = i; > + continue; > + } > + /* [COMPR_ADDR, NULL_ADDR or NEW_ADDR, valid_blkaddr] */ > + if (cluster_end) { > + reason = "[C|N|N|V]"; > + goto out; > + } > + } > + } > + return false; > +out: > + f2fs_warn(sbi, "access invalid cluster, ino:%lu, nid:%u, ofs_in_node:%u, reason:%s", > + dn->inode->i_ino, dn->nid, dn->ofs_in_node, reason); > + set_sbi_flag(sbi, SBI_NEED_FSCK); > + return true; > +} > + > static int __f2fs_cluster_blocks(struct inode *inode, > unsigned int cluster_idx, bool compr) > { > @@ -915,6 +963,11 @@ static int __f2fs_cluster_blocks(struct inode *inode, > goto fail; > } > > + if (f2fs_sanity_check_cluster(&dn)) { > + ret = -EFSCORRUPTED; > + goto fail; > + } > + > if (dn.data_blkaddr == COMPRESS_ADDR) { > int i; > > diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c > index 948083c88d17..75dda2035f68 100644 > --- a/fs/f2fs/data.c > +++ b/fs/f2fs/data.c > @@ -1558,13 +1558,20 @@ int f2fs_map_blocks(struct inode *inode, struct f2fs_map_blocks *map, > } > if (flag == F2FS_GET_BLOCK_PRECACHE) > goto sync_out; > - if (flag == F2FS_GET_BLOCK_FIEMAP && > - blkaddr == NULL_ADDR) { > - if (map->m_next_pgofs) > - *map->m_next_pgofs = pgofs + 1; > - goto sync_out; > - } > - if (flag != F2FS_GET_BLOCK_FIEMAP) { > + if (flag == F2FS_GET_BLOCK_FIEMAP) { > + if (blkaddr == NULL_ADDR) { > + if (map->m_next_pgofs) > + *map->m_next_pgofs = pgofs + 1; > + goto sync_out; > + } > +#ifdef CONFIG_F2FS_FS_COMPRESSION > + if (f2fs_compressed_file(inode) && > + f2fs_sanity_check_cluster(&dn)) { > + err = -EFSCORRUPTED; I prefer to give the block map as is instead of giving an error, since this takes away to debug the problem from user-land. > + goto sync_out; > + } > +#endif > + } else { > /* for defragment case */ > if (map->m_next_pgofs) > *map->m_next_pgofs = pgofs + 1; > diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h > index 20389b9b3eac..86d416ffad61 100644 > --- a/fs/f2fs/f2fs.h > +++ b/fs/f2fs/f2fs.h > @@ -4060,6 +4060,7 @@ void f2fs_end_read_compressed_page(struct page *page, bool failed, > block_t blkaddr); > bool f2fs_cluster_is_empty(struct compress_ctx *cc); > bool f2fs_cluster_can_merge_page(struct compress_ctx *cc, pgoff_t index); > +bool f2fs_sanity_check_cluster(struct dnode_of_data *dn); > void f2fs_compress_ctx_add_page(struct compress_ctx *cc, struct page *page); > int f2fs_write_multi_pages(struct compress_ctx *cc, > int *submitted, > -- > 2.22.1