Received: by 2002:a05:6a10:c604:0:0:0:0 with SMTP id y4csp105136pxt; Thu, 5 Aug 2021 19:36:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy0OEdW8oBQHnWPaQ4xNyaaqmL1OElBhNQh6DrCQ0XIzjFw1oZm3JJ/QiS/B7edZURTVJeb X-Received: by 2002:a05:6602:1d4:: with SMTP id w20mr774670iot.121.1628217397552; Thu, 05 Aug 2021 19:36:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628217397; cv=none; d=google.com; s=arc-20160816; b=egFTRHBY86oTkXmnRTFX/4nOj7X4q/BAolJZklHQSmIlJSGdyy2mAMaMt3JlpvsBEW C+Op4+K0apUzxevT70pAYzioeDleSWl8kVBs6HFCgxC76MK9Y8V0IkEx4et7Wlqwwu5p GgWuQ4Lu3/qbvgmJTJI0Zn/5xZYibAS6cS/eCVKRh8dLCd2mesIaodvqGNowC7y8trZy 1wVPjq8JeUVhfxy0oRzEiFmWmVP09ae11Q57kEb/VZ2pB67qrUN23Lncnmz5wQHHLe2D JjfkS3/RgprLhmWdU7ZtKkFiXzn1JUaRyYvWj1xSC6pp+SRum/5k6mvWlMQNB3eTSnrM Okjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=z6CM7BTIcly4/l1lL4oBUAgbYK4399EbzX2NgZB8nsQ=; b=ueVrbUfy7Gju8JD0hEITV4+FxG1vHNKqIoHEbJi8HfOeVAXAc3TmvnvsPYJUN69om7 UcBSm0CIG/knVI6bpsYbUR5xeWg7lMKUOEjLasYTtxkvayCesXEE+ak2st+tVtK9N57x AST7MtHuWG4pvYZllT5N05XuZVGUFtFtqBIFwYKgagtyPPPnxZdNnj5brBIGX3Qu6HyD 6qvhatuquZ2SWn/K0lbtIHQMQQXMdt6mjqnRd4GDXQLz/2GrFjlzfOi4wdM6Lni/XtnH SM/G+aTPfaSRDelbtZxnEVZcFYSHpOGfka3pD+v7e6kC9NZnndOGlTLlEvXzD1yEDh7r d68A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=akZQ6u2L; 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 o10si7304033jat.32.2021.08.05.19.36.23; Thu, 05 Aug 2021 19:36:37 -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=akZQ6u2L; 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 S239110AbhHFADO (ORCPT + 99 others); Thu, 5 Aug 2021 20:03:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:39238 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229644AbhHFADN (ORCPT ); Thu, 5 Aug 2021 20:03:13 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6D08D60041; Fri, 6 Aug 2021 00:02:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1628208178; bh=w+EzrCFzoXO++utJ5paGjn1FR/ff9cpEjnMnfwT0t/c=; h=From:To:Cc:Subject:Date:From; b=akZQ6u2Lb+L6bHJIqwoQfEQEBWlGgz0lZfMKdDs7ZHfpj5DjtCUeWgdHUsaH3NMC1 9kPfFPdbZoS4ZgGJfO6IbC2IYykgsH8bz3BrTMosfSP0WuYzJvRZdUht1ePOWQHcN4 Jm+9aPLOu4zOruiiENrDmfME1nQ8C1HK764bO62tR7w/ZVPPV9AEIM670+exMt5zXz uRDTZ7iV8V0rCsNC7l/HPHkTQoVM2/1OAYYZIk72zTnVOAtT1Iz70UTIFSlkB5JARb l30EI+5NQlH0h9UOLXJWVbtFLjUp9Vj4wrmWYb19O0w6mpYBMoHMImw6jLYApIWTGk cizeNgMhPsFww== From: Chao Yu To: jaegeuk@kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Chao Yu , Chao Yu Subject: [PATCH v2] f2fs: compress: do sanity check on cluster Date: Fri, 6 Aug 2021 08:02:50 +0800 Message-Id: <20210806000250.39728-1-chao@kernel.org> X-Mailer: git-send-email 2.22.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- v2: - cover all map_block cases - give EFSCORRUPTED only when CHECK_FS is enabled for fiemap() fs/f2fs/compress.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++ fs/f2fs/data.c | 9 ++++++++ fs/f2fs/f2fs.h | 1 + 3 files changed, 63 insertions(+) diff --git a/fs/f2fs/compress.c b/fs/f2fs/compress.c index 7dbfd6965b97..f25b32a6893a 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 df5e8d8c654e..d4c9aeba0842 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -1552,6 +1552,15 @@ int f2fs_map_blocks(struct inode *inode, struct f2fs_map_blocks *map, map->m_flags |= F2FS_MAP_NEW; blkaddr = dn.data_blkaddr; } else { +#ifdef CONFIG_F2FS_FS_COMPRESSION + if (f2fs_compressed_file(inode) && + f2fs_sanity_check_cluster(&dn) && + (flag != F2FS_GET_BLOCK_FIEMAP || + IS_ENABLED(CONFIG_F2FS_CHECK_FS))) { + err = -EFSCORRUPTED; + goto sync_out; + } +#endif if (flag == F2FS_GET_BLOCK_BMAP) { map->m_pblk = 0; goto sync_out; diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index e97b4d8c5efc..3b368bcbc4d7 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -4074,6 +4074,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