f2fs: compress: do sanity check on cluster
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 <chao@kernel.org> [Nathan Chancellor: fix missing inline warning] Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
This commit is contained in:
parent
b35d71b969
commit
bbe1da7e34
|
@ -899,6 +899,54 @@ static bool cluster_has_invalid_data(struct compress_ctx *cc)
|
||||||
return false;
|
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,
|
static int __f2fs_cluster_blocks(struct inode *inode,
|
||||||
unsigned int cluster_idx, bool compr)
|
unsigned int cluster_idx, bool compr)
|
||||||
{
|
{
|
||||||
|
@ -916,6 +964,11 @@ static int __f2fs_cluster_blocks(struct inode *inode,
|
||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (f2fs_sanity_check_cluster(&dn)) {
|
||||||
|
ret = -EFSCORRUPTED;
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
if (dn.data_blkaddr == COMPRESS_ADDR) {
|
if (dn.data_blkaddr == COMPRESS_ADDR) {
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
|
|
@ -1552,6 +1552,13 @@ next_block:
|
||||||
map->m_flags |= F2FS_MAP_NEW;
|
map->m_flags |= F2FS_MAP_NEW;
|
||||||
blkaddr = dn.data_blkaddr;
|
blkaddr = dn.data_blkaddr;
|
||||||
} else {
|
} else {
|
||||||
|
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;
|
||||||
|
}
|
||||||
if (flag == F2FS_GET_BLOCK_BMAP) {
|
if (flag == F2FS_GET_BLOCK_BMAP) {
|
||||||
map->m_pblk = 0;
|
map->m_pblk = 0;
|
||||||
goto sync_out;
|
goto sync_out;
|
||||||
|
|
|
@ -4090,6 +4090,7 @@ void f2fs_end_read_compressed_page(struct page *page, bool failed,
|
||||||
block_t blkaddr);
|
block_t blkaddr);
|
||||||
bool f2fs_cluster_is_empty(struct compress_ctx *cc);
|
bool f2fs_cluster_is_empty(struct compress_ctx *cc);
|
||||||
bool f2fs_cluster_can_merge_page(struct compress_ctx *cc, pgoff_t index);
|
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);
|
void f2fs_compress_ctx_add_page(struct compress_ctx *cc, struct page *page);
|
||||||
int f2fs_write_multi_pages(struct compress_ctx *cc,
|
int f2fs_write_multi_pages(struct compress_ctx *cc,
|
||||||
int *submitted,
|
int *submitted,
|
||||||
|
@ -4161,6 +4162,7 @@ static inline void f2fs_put_page_dic(struct page *page)
|
||||||
WARN_ON_ONCE(1);
|
WARN_ON_ONCE(1);
|
||||||
}
|
}
|
||||||
static inline unsigned int f2fs_cluster_blocks_are_contiguous(struct dnode_of_data *dn) { return 0; }
|
static inline unsigned int f2fs_cluster_blocks_are_contiguous(struct dnode_of_data *dn) { return 0; }
|
||||||
|
static inline bool f2fs_sanity_check_cluster(struct dnode_of_data *dn) { return false; }
|
||||||
static inline int f2fs_init_compress_inode(struct f2fs_sb_info *sbi) { return 0; }
|
static inline int f2fs_init_compress_inode(struct f2fs_sb_info *sbi) { return 0; }
|
||||||
static inline void f2fs_destroy_compress_inode(struct f2fs_sb_info *sbi) { }
|
static inline void f2fs_destroy_compress_inode(struct f2fs_sb_info *sbi) { }
|
||||||
static inline int f2fs_init_page_array_cache(struct f2fs_sb_info *sbi) { return 0; }
|
static inline int f2fs_init_page_array_cache(struct f2fs_sb_info *sbi) { return 0; }
|
||||||
|
|
Loading…
Reference in New Issue