X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=e2fsck%2Fpass2.c;h=e504b30ad5f3e0914af87d74f89db8dbc4e78d3d;hb=45780b37ef2ad6142ab882a85b90e608c5b6f0c3;hp=94665c6ed3dc921e29fbc065b3161aedc38dfcf1;hpb=62ad24802c6e9abd0acf3e6d12aeaab3ae8c6f5a;p=tools%2Fe2fsprogs.git diff --git a/e2fsck/pass2.c b/e2fsck/pass2.c index 94665c6..e504b30 100644 --- a/e2fsck/pass2.c +++ b/e2fsck/pass2.c @@ -35,10 +35,14 @@ * - The inode_used_map bitmap * - The inode_bad_map bitmap * - The inode_dir_map bitmap + * - The encrypted_file_info + * - The inode_casefold_map bitmap * * Pass 2 frees the following data structures * - The inode_bad_map bitmap * - The inode_reg_map bitmap + * - The encrypted_file_info + * - The inode_casefold_map bitmap */ #define _GNU_SOURCE 1 /* get strnlen() */ @@ -47,7 +51,7 @@ #include "e2fsck.h" #include "problem.h" -#include "dict.h" +#include "support/dict.h" #ifdef NO_INLINE_FUNCS #define _INLINE_ @@ -61,6 +65,9 @@ * Keeps track of how many times an inode is referenced. */ static void deallocate_inode(e2fsck_t ctx, ext2_ino_t ino, char* block_buf); +static int check_dir_block2(ext2_filsys fs, + struct ext2_db_entry2 *dir_blocks_info, + void *priv_data); static int check_dir_block(ext2_filsys fs, struct ext2_db_entry2 *dir_blocks_info, void *priv_data); @@ -68,8 +75,8 @@ static int allocate_dir_block(e2fsck_t ctx, struct ext2_db_entry2 *dir_blocks_info, char *buf, struct problem_context *pctx); static void clear_htree(e2fsck_t ctx, ext2_ino_t ino); -static int htree_depth(struct dx_dir_info *dx_dir, - struct dx_dirblock_info *dx_db); +static short htree_depth(struct dx_dir_info *dx_dir, + struct dx_dirblock_info *dx_db); static EXT2_QSORT_TYPE special_dir_block_cmp(const void *a, const void *b); struct check_dir_struct { @@ -77,25 +84,64 @@ struct check_dir_struct { struct problem_context pctx; int count, max; e2fsck_t ctx; + unsigned long long list_offset; + unsigned long long ra_entries; + unsigned long long next_ra_off; }; +static void update_parents(struct dx_dir_info *dx_dir, int type) +{ + struct dx_dirblock_info *dx_db, *dx_parent, *dx_previous; + blk_t b; + + for (b = 0, dx_db = dx_dir->dx_block; + b < dx_dir->numblocks; + b++, dx_db++) { + dx_parent = &dx_dir->dx_block[dx_db->parent]; + if (dx_db->type != type) + continue; + + /* + * XXX Make sure dx_parent->min_hash > dx_db->min_hash + */ + if (dx_db->flags & DX_FLAG_FIRST) { + dx_parent->min_hash = dx_db->min_hash; + if (dx_parent->previous) { + dx_previous = + &dx_dir->dx_block[dx_parent->previous]; + dx_previous->node_max_hash = + dx_parent->min_hash; + } + } + /* + * XXX Make sure dx_parent->max_hash < dx_db->max_hash + */ + if (dx_db->flags & DX_FLAG_LAST) { + dx_parent->max_hash = dx_db->max_hash; + } + } +} + void e2fsck_pass2(e2fsck_t ctx) { struct ext2_super_block *sb = ctx->fs->super; struct problem_context pctx; ext2_filsys fs = ctx->fs; - char *buf; + char *buf = NULL; #ifdef RESOURCE_TRACK struct resource_track rtrack; #endif struct check_dir_struct cd; struct dx_dir_info *dx_dir; - struct dx_dirblock_info *dx_db, *dx_parent; - unsigned int save_type; - int b; - int i, depth; + struct dx_dirblock_info *dx_db; + blk_t b; + ext2_ino_t i; + short depth; problem_t code; int bad_dir; + int (*check_dir_func)(ext2_filsys fs, + struct ext2_db_entry2 *dir_blocks_info, + void *priv_data); init_resource_track(&rtrack, ctx->fs->io); clear_problem_context(&cd.pctx); @@ -107,23 +153,13 @@ void e2fsck_pass2(e2fsck_t ctx) if (!(ctx->options & E2F_OPT_PREEN)) fix_problem(ctx, PR_2_PASS_HEADER, &cd.pctx); - e2fsck_setup_tdb_icount(ctx, EXT2_ICOUNT_OPT_INCREMENT, - &ctx->inode_count); - if (ctx->inode_count) - cd.pctx.errcode = 0; - else { - e2fsck_set_bitmap_type(fs, EXT2FS_BMAP64_RBTREE, - "inode_count", &save_type); - cd.pctx.errcode = ext2fs_create_icount2(fs, - EXT2_ICOUNT_OPT_INCREMENT, - 0, ctx->inode_link_info, - &ctx->inode_count); - fs->default_bitmap_type = save_type; - } + cd.pctx.errcode = e2fsck_setup_icount(ctx, "inode_count", + EXT2_ICOUNT_OPT_INCREMENT, + ctx->inode_link_info, &ctx->inode_count); if (cd.pctx.errcode) { fix_problem(ctx, PR_2_ALLOCATE_ICOUNT, &cd.pctx); ctx->flags |= E2F_FLAG_ABORT; - return; + goto cleanup; } buf = (char *) e2fsck_allocate_memory(ctx, 2*fs->blocksize, "directory scan buffer"); @@ -139,33 +175,36 @@ void e2fsck_pass2(e2fsck_t ctx) cd.ctx = ctx; cd.count = 1; cd.max = ext2fs_dblist_count2(fs->dblist); + cd.list_offset = 0; + cd.ra_entries = ctx->readahead_kb * 1024 / ctx->fs->blocksize; + cd.next_ra_off = 0; if (ctx->progress) (void) (ctx->progress)(ctx, 2, 0, cd.max); - if (fs->super->s_feature_compat & EXT2_FEATURE_COMPAT_DIR_INDEX) + if (ext2fs_has_feature_dir_index(fs->super)) ext2fs_dblist_sort2(fs->dblist, special_dir_block_cmp); - cd.pctx.errcode = ext2fs_dblist_iterate2(fs->dblist, check_dir_block, + check_dir_func = cd.ra_entries ? check_dir_block2 : check_dir_block; + cd.pctx.errcode = ext2fs_dblist_iterate2(fs->dblist, check_dir_func, &cd); - if (ctx->flags & E2F_FLAG_SIGNAL_MASK || ctx->flags & E2F_FLAG_RESTART) - return; - if (ctx->flags & E2F_FLAG_RESTART_LATER) { ctx->flags |= E2F_FLAG_RESTART; - return; + ctx->flags &= ~E2F_FLAG_RESTART_LATER; } + if (ctx->flags & E2F_FLAG_RUN_RETURN) + goto cleanup; + if (cd.pctx.errcode) { fix_problem(ctx, PR_2_DBLIST_ITERATE, &cd.pctx); ctx->flags |= E2F_FLAG_ABORT; - return; + goto cleanup; } -#ifdef ENABLE_HTREE for (i=0; (dx_dir = e2fsck_dx_dir_info_iter(ctx, &i)) != 0;) { if (ctx->flags & E2F_FLAG_SIGNAL_MASK) - return; + goto cleanup; if (e2fsck_dir_will_be_rehashed(ctx, dx_dir->ino) || dx_dir->numblocks == 0) continue; @@ -181,24 +220,11 @@ void e2fsck_pass2(e2fsck_t ctx) * Find all of the first and last leaf blocks, and * update their parent's min and max hash values */ - for (b=0, dx_db = dx_dir->dx_block; - b < dx_dir->numblocks; - b++, dx_db++) { - if ((dx_db->type != DX_DIRBLOCK_LEAF) || - !(dx_db->flags & (DX_FLAG_FIRST | DX_FLAG_LAST))) - continue; - dx_parent = &dx_dir->dx_block[dx_db->parent]; - /* - * XXX Make sure dx_parent->min_hash > dx_db->min_hash - */ - if (dx_db->flags & DX_FLAG_FIRST) - dx_parent->min_hash = dx_db->min_hash; - /* - * XXX Make sure dx_parent->max_hash < dx_db->max_hash - */ - if (dx_db->flags & DX_FLAG_LAST) - dx_parent->max_hash = dx_db->max_hash; - } + update_parents(dx_dir, DX_DIRBLOCK_LEAF); + + /* for 3 level htree: update 2 level parent's min + * and max hash values */ + update_parents(dx_dir, DX_DIRBLOCK_NODE); for (b=0, dx_db = dx_dir->dx_block; b < dx_dir->numblocks; @@ -251,7 +277,7 @@ void e2fsck_pass2(e2fsck_t ctx) } } e2fsck_free_dx_dir_info(ctx); -#endif + ext2fs_free_mem(&buf); ext2fs_free_dblist(fs->dblist); @@ -263,18 +289,21 @@ void e2fsck_pass2(e2fsck_t ctx) ext2fs_free_inode_bitmap(ctx->inode_reg_map); ctx->inode_reg_map = 0; } - if (ctx->encrypted_dirs) { - ext2fs_u32_list_free(ctx->encrypted_dirs); - ctx->encrypted_dirs = 0; + if (ctx->inode_casefold_map) { + ext2fs_free_inode_bitmap(ctx->inode_casefold_map); + ctx->inode_casefold_map = 0; + } + destroy_encrypted_file_info(ctx); + if (ctx->casefolded_dirs) { + ext2fs_u32_list_free(ctx->casefolded_dirs); + ctx->casefolded_dirs = 0; } clear_problem_context(&pctx); if (ctx->large_files) { - if (!(sb->s_feature_ro_compat & - EXT2_FEATURE_RO_COMPAT_LARGE_FILE) && + if (!ext2fs_has_feature_large_file(sb) && fix_problem(ctx, PR_2_FEATURE_LARGE_FILES, &pctx)) { - sb->s_feature_ro_compat |= - EXT2_FEATURE_RO_COMPAT_LARGE_FILE; + ext2fs_set_feature_large_file(sb); fs->flags &= ~EXT2_FLAG_MASTER_SB_ONLY; ext2fs_mark_super_dirty(fs); } @@ -286,13 +315,15 @@ void e2fsck_pass2(e2fsck_t ctx) } print_resource_track(ctx, _("Pass 2"), &rtrack, fs->io); +cleanup: + ext2fs_free_mem(&buf); } #define MAX_DEPTH 32000 -static int htree_depth(struct dx_dir_info *dx_dir, - struct dx_dirblock_info *dx_db) +static short htree_depth(struct dx_dir_info *dx_dir, + struct dx_dirblock_info *dx_db) { - int depth = 0; + short depth = 0; while (dx_db->type != DX_DIRBLOCK_ROOT && depth < MAX_DEPTH) { dx_db = &dx_dir->dx_block[dx_db->parent]; @@ -301,7 +332,7 @@ static int htree_depth(struct dx_dir_info *dx_dir, return depth; } -static int dict_de_cmp(const void *a, const void *b) +static int dict_de_cmp(const void *cmp_ctx, const void *a, const void *b) { const struct ext2_dir_entry *de_a, *de_b; int a_len, b_len; @@ -317,6 +348,21 @@ static int dict_de_cmp(const void *a, const void *b) return memcmp(de_a->name, de_b->name, a_len); } +static int dict_de_cf_cmp(const void *cmp_ctx, const void *a, const void *b) +{ + const struct ext2fs_nls_table *tbl = cmp_ctx; + const struct ext2_dir_entry *de_a, *de_b; + int a_len, b_len; + + de_a = (const struct ext2_dir_entry *) a; + a_len = ext2fs_dirent_name_len(de_a); + de_b = (const struct ext2_dir_entry *) b; + b_len = ext2fs_dirent_name_len(de_b); + + return ext2fs_casefold_cmp(tbl, (unsigned char *) de_a->name, a_len, + (unsigned char *) de_b->name, b_len); +} + /* * This is special sort function that makes sure that directory blocks * with a dirblock of zero are sorted to the beginning of the list. @@ -463,7 +509,6 @@ static int check_dotdot(e2fsck_t ctx, */ static int check_name(e2fsck_t ctx, struct ext2_dir_entry *dirent, - ext2_ino_t dir_ino, struct problem_context *pctx) { int i; @@ -483,6 +528,42 @@ static int check_name(e2fsck_t ctx, return ret; } +static int encrypted_check_name(e2fsck_t ctx, + const struct ext2_dir_entry *dirent, + struct problem_context *pctx) +{ + if (ext2fs_dirent_name_len(dirent) < EXT4_CRYPTO_BLOCK_SIZE) { + if (fix_problem(ctx, PR_2_BAD_ENCRYPTED_NAME, pctx)) + return 1; + ext2fs_unmark_valid(ctx->fs); + } + return 0; +} + +static int encoded_check_name(e2fsck_t ctx, + struct ext2_dir_entry *dirent, + struct problem_context *pctx) +{ + const struct ext2fs_nls_table *tbl = ctx->fs->encoding; + int ret; + int len = ext2fs_dirent_name_len(dirent); + char *pos, *end; + + ret = ext2fs_check_encoded_name(tbl, dirent->name, len, &pos); + if (ret < 0) { + fatal_error(ctx, _("NLS is broken.")); + } else if(ret > 0) { + ret = fix_problem(ctx, PR_2_BAD_ENCODED_NAME, pctx); + if (ret) { + end = &dirent->name[len]; + for (; *pos && pos != end; pos++) + *pos = '.'; + } + } + + return (ret || check_name(ctx, dirent, pctx)); +} + /* * Check the directory filetype (if present) */ @@ -495,8 +576,7 @@ static _INLINE_ int check_filetype(e2fsck_t ctx, int should_be = EXT2_FT_UNKNOWN; struct ext2_inode inode; - if (!(ctx->fs->super->s_feature_incompat & - EXT2_FEATURE_INCOMPAT_FILETYPE)) { + if (!ext2fs_has_feature_filetype(ctx->fs->super)) { if (filetype == 0 || !fix_problem(ctx, PR_2_CLEAR_FILETYPE, pctx)) return 0; @@ -530,15 +610,14 @@ static _INLINE_ int check_filetype(e2fsck_t ctx, return 1; } -#ifdef ENABLE_HTREE static void parse_int_node(ext2_filsys fs, struct ext2_db_entry2 *db, struct check_dir_struct *cd, struct dx_dir_info *dx_dir, char *block_buf, int failed_csum) { - struct ext2_dx_root_info *root; - struct ext2_dx_entry *ent; + struct ext2_dx_root_info *root; + struct ext2_dx_entry *ent; struct ext2_dx_countlimit *limit; struct dx_dirblock_info *dx_db; int i, expect_limit, count; @@ -554,10 +633,10 @@ static void parse_int_node(ext2_filsys fs, #ifdef DX_DEBUG printf("Root node dump:\n"); printf("\t Reserved zero: %u\n", root->reserved_zero); - printf("\t Hash Version: %d\n", root->hash_version); - printf("\t Info length: %d\n", root->info_length); - printf("\t Indirect levels: %d\n", root->indirect_levels); - printf("\t Flags: %d\n", root->unused_flags); + printf("\t Hash Version: %u\n", root->hash_version); + printf("\t Info length: %u\n", root->info_length); + printf("\t Indirect levels: %u\n", root->indirect_levels); + printf("\t Flags: %x\n", root->unused_flags); #endif ent = (struct ext2_dx_entry *) (block_buf + 24 + root->info_length); @@ -587,8 +666,7 @@ static void parse_int_node(ext2_filsys fs, #endif count = ext2fs_le16_to_cpu(limit->count); - if (EXT2_HAS_RO_COMPAT_FEATURE(fs->super, - EXT4_FEATURE_RO_COMPAT_METADATA_CSUM)) + if (ext2fs_has_feature_metadata_csum(fs->super)) csum_size = sizeof(struct ext2_dx_tail); expect_limit = (fs->blocksize - (csum_size + ((char *) ent - block_buf))) / @@ -612,9 +690,9 @@ static void parse_int_node(ext2_filsys fs, printf("Entry #%d: Hash 0x%08x, block %u\n", i, hash, ext2fs_le32_to_cpu(ent[i].block)); #endif - blk = ext2fs_le32_to_cpu(ent[i].block) & 0x0ffffff; + blk = ext2fs_le32_to_cpu(ent[i].block) & EXT4_DX_BLOCK_MASK; /* Check to make sure the block is valid */ - if (blk >= (blk_t) dx_dir->numblocks) { + if (blk >= dx_dir->numblocks) { cd->pctx.blk = blk; if (fix_problem(cd->ctx, PR_2_HTREE_BADBLK, &cd->pctx)) @@ -631,6 +709,11 @@ static void parse_int_node(ext2_filsys fs, dx_db->flags |= DX_FLAG_REFERENCED; dx_db->parent = db->blockcnt; } + + dx_db->previous = + i ? (ext2fs_le32_to_cpu(ent[i-1].block) & + EXT4_DX_BLOCK_MASK) : 0; + if (hash < min_hash) min_hash = hash; if (hash > max_hash) @@ -660,7 +743,6 @@ clear_and_exit: dx_dir->numblocks = 0; e2fsck_rehash_dir_later(cd->ctx, cd->pctx.ino); } -#endif /* ENABLE_HTREE */ /* * Given a busted directory, try to salvage it somehow. @@ -670,7 +752,8 @@ static void salvage_directory(ext2_filsys fs, struct ext2_dir_entry *dirent, struct ext2_dir_entry *prev, unsigned int *offset, - unsigned int block_len) + unsigned int block_len, + int hash_in_dirent) { char *cp = (char *) dirent; int left; @@ -695,7 +778,8 @@ static void salvage_directory(ext2_filsys fs, * Special case of directory entry of size 8: copy what's left * of the directory block up to cover up the invalid hole. */ - if ((left >= 12) && (rec_len == EXT2_DIR_ENTRY_HEADER_LEN)) { + if ((left >= ext2fs_dir_rec_len(1, hash_in_dirent)) && + (rec_len == EXT2_DIR_ENTRY_HEADER_LEN)) { memmove(cp, cp+EXT2_DIR_ENTRY_HEADER_LEN, left); memset(cp + left, 0, EXT2_DIR_ENTRY_HEADER_LEN); return; @@ -707,7 +791,7 @@ static void salvage_directory(ext2_filsys fs, */ if ((left < 0) && ((int) rec_len + left > EXT2_DIR_ENTRY_HEADER_LEN) && - ((int) name_len + EXT2_DIR_ENTRY_HEADER_LEN <= (int) rec_len + left) && + ((int) ext2fs_dir_rec_len(name_len, hash_in_dirent) <= (int) rec_len + left) && dirent->inode <= fs->super->s_inodes_count && strnlen(dirent->name, name_len) == name_len) { (void) ext2fs_set_rec_len(fs, (int) rec_len + left, dirent); @@ -760,11 +844,11 @@ static errcode_t insert_dirent_tail(ext2_filsys fs, void *dirbuf) d = NEXT_DIRENT(d); if (d != top) { - size_t min_size = EXT2_DIR_REC_LEN( + unsigned int min_size = EXT2_DIR_REC_LEN( ext2fs_dirent_name_len(dirbuf)); - if (min_size > top - (void *)d) + if (min_size > (char *)top - (char *)d) return EXT2_ET_DIR_NO_SPACE_FOR_CSUM; - d->rec_len = top - (void *)d; + d->rec_len = (char *)top - (char *)d; } t = (struct ext2_dir_entry_tail *)top; @@ -842,30 +926,92 @@ err: return retval; } -int get_filename_hash(ext2_filsys fs, int encrypted, int version, - const char *name, int len, ext2_dirhash_t *ret_hash, - ext2_dirhash_t *ret_minor_hash) +/* Return true if this type of file needs encryption */ +static int needs_encryption(e2fsck_t ctx, const struct ext2_dir_entry *dirent) { - char buf[2*EXT2FS_DIGEST_SIZE]; - int buf_len; + int filetype = ext2fs_dirent_file_type(dirent); + ext2_ino_t ino = dirent->inode; + struct ext2_inode inode; - if (!encrypted) - return ext2fs_dirhash(version, name, len, - fs->super->s_hash_seed, - ret_hash, ret_minor_hash); + if (filetype != EXT2_FT_UNKNOWN) + return filetype == EXT2_FT_REG_FILE || + filetype == EXT2_FT_DIR || + filetype == EXT2_FT_SYMLINK; - if (len <= EXT2FS_DIGEST_SIZE) - buf_len = ext2fs_digest_encode(name, len, buf); - else { - ext2fs_sha256(name, len, buf + EXT2FS_DIGEST_SIZE); - buf[0] = 'I'; - buf_len = ext2fs_digest_encode(buf + EXT2FS_DIGEST_SIZE, - EXT2FS_DIGEST_SIZE, buf + 1); - buf_len++; - } - return ext2fs_dirhash(version, buf, buf_len, - fs->super->s_hash_seed, - ret_hash, ret_minor_hash); + if (ext2fs_test_inode_bitmap2(ctx->inode_reg_map, ino) || + ext2fs_test_inode_bitmap2(ctx->inode_dir_map, ino)) + return 1; + + e2fsck_read_inode(ctx, ino, &inode, "check_encryption_policy"); + return LINUX_S_ISREG(inode.i_mode) || + LINUX_S_ISDIR(inode.i_mode) || + LINUX_S_ISLNK(inode.i_mode); +} + +/* + * All regular files, directories, and symlinks in encrypted directories must be + * encrypted using the same encryption policy as their directory. + * + * Returns 1 if the dirent should be cleared, otherwise 0. + */ +static int check_encryption_policy(e2fsck_t ctx, + const struct ext2_dir_entry *dirent, + __u32 dir_encpolicy_id, + struct problem_context *pctx) +{ + __u32 file_encpolicy_id = find_encryption_policy(ctx, dirent->inode); + + /* Same policy or both UNRECOGNIZED_ENCRYPTION_POLICY? */ + if (file_encpolicy_id == dir_encpolicy_id) + return 0; + + if (file_encpolicy_id == NO_ENCRYPTION_POLICY) { + if (!needs_encryption(ctx, dirent)) + return 0; + return fix_problem(ctx, PR_2_UNENCRYPTED_FILE, pctx); + } + + return fix_problem(ctx, PR_2_INCONSISTENT_ENCRYPTION_POLICY, pctx); +} + +/* + * Check an encrypted directory entry. + * + * Returns 1 if the dirent should be cleared, otherwise 0. + */ +static int check_encrypted_dirent(e2fsck_t ctx, + const struct ext2_dir_entry *dirent, + __u32 dir_encpolicy_id, + struct problem_context *pctx) +{ + if (encrypted_check_name(ctx, dirent, pctx)) + return 1; + if (check_encryption_policy(ctx, dirent, dir_encpolicy_id, pctx)) + return 1; + return 0; +} + +static int check_dir_block2(ext2_filsys fs, + struct ext2_db_entry2 *db, + void *priv_data) +{ + int err; + struct check_dir_struct *cd = priv_data; + + if (cd->ra_entries && cd->list_offset >= cd->next_ra_off) { + err = e2fsck_readahead_dblist(fs, + E2FSCK_RA_DBLIST_IGNORE_BLOCKCNT, + fs->dblist, + cd->list_offset + cd->ra_entries / 8, + cd->ra_entries); + if (err) + cd->ra_entries = 0; + cd->next_ra_off = cd->list_offset + (cd->ra_entries * 7 / 8); + } + + err = check_dir_block(fs, db, priv_data); + cd->list_offset++; + return err; } static int check_dir_block(ext2_filsys fs, @@ -873,9 +1019,7 @@ static int check_dir_block(ext2_filsys fs, void *priv_data) { struct dx_dir_info *dx_dir; -#ifdef ENABLE_HTREE struct dx_dirblock_info *dx_db = 0; -#endif /* ENABLE_HTREE */ struct ext2_dir_entry *dirent, *prev, dot, dotdot; ext2_dirhash_t hash; unsigned int offset = 0; @@ -901,27 +1045,37 @@ static int check_dir_block(ext2_filsys fs, int is_leaf = 1; size_t inline_data_size = 0; int filetype = 0; - int encrypted = 0; + __u32 dir_encpolicy_id = NO_ENCRYPTION_POLICY; + int hash_in_dirent = 0; + int casefolded = 0; size_t max_block_size; + int hash_flags = 0; + static char *eop_read_dirblock = NULL; + int cf_dir = 0; cd = (struct check_dir_struct *) priv_data; ibuf = buf = cd->buf; ctx = cd->ctx; - if (ctx->flags & E2F_FLAG_SIGNAL_MASK || ctx->flags & E2F_FLAG_RESTART) + /* We only want filename encoding verification on strict + * mode or if explicitly requested by user. */ + if (ext2fs_test_inode_bitmap2(ctx->inode_casefold_map, ino) && + ((ctx->fs->super->s_encoding_flags & EXT4_ENC_STRICT_MODE_FL) || + (ctx->options & E2F_OPT_CHECK_ENCODING))) + cf_dir = 1; + + if (ctx->flags & E2F_FLAG_RUN_RETURN) return DIRENT_ABORT; if (ctx->progress && (ctx->progress)(ctx, 2, cd->count++, cd->max)) return DIRENT_ABORT; - if (EXT2_HAS_RO_COMPAT_FEATURE(fs->super, - EXT4_FEATURE_RO_COMPAT_METADATA_CSUM)) { + if (ext2fs_has_feature_metadata_csum(fs->super)) { dx_csum_size = sizeof(struct ext2_dx_tail); de_csum_size = sizeof(struct ext2_dir_entry_tail); } - if (EXT2_HAS_INCOMPAT_FEATURE(fs->super, - EXT2_FEATURE_INCOMPAT_FILETYPE)) + if (ext2fs_has_feature_filetype(fs->super)) filetype = EXT2_FT_DIR << 8; /* @@ -938,8 +1092,7 @@ static int check_dir_block(ext2_filsys fs, cd->pctx.dirent = 0; cd->pctx.num = 0; - if (EXT2_HAS_INCOMPAT_FEATURE(fs->super, - EXT4_FEATURE_INCOMPAT_INLINE_DATA)) { + if (ext2fs_has_feature_inline_data(fs->super)) { errcode_t ec; ec = ext2fs_inline_data_size(fs, ino, &inline_data_size); @@ -947,6 +1100,15 @@ static int check_dir_block(ext2_filsys fs, return DIRENT_ABORT; } + /* This will allow (at some point in the future) to punch out empty + * directory blocks and reduce the space used by a directory that grows + * very large and then the files are deleted. For now, all that is + * needed is to avoid e2fsck filling in these holes as part of + * feature flag. */ + if (db->blk == 0 && ext2fs_has_feature_largedir(fs->super) && + !ext2fs_has_feature_inline_data(fs->super)) + return 0; + if (db->blk == 0 && !inline_data_size) { if (allocate_dir_block(ctx, db, buf, &cd->pctx)) return 0; @@ -967,7 +1129,9 @@ static int check_dir_block(ext2_filsys fs, db->blockcnt, ino); #endif - ehandler_operation(_("reading directory block")); + if (!eop_read_dirblock) + eop_read_dirblock = (char *) _("reading directory block"); + ehandler_operation(eop_read_dirblock); if (inline_data_size) { memset(buf, 0, fs->blocksize - inline_data_size); cd->pctx.errcode = ext2fs_inline_data_get(fs, ino, 0, buf, 0); @@ -1028,7 +1192,6 @@ inline_read_fail: memcpy(buf, buf2, fs->blocksize); ext2fs_free_mem(&buf2); } -#ifdef ENABLE_HTREE dx_dir = e2fsck_get_dx_dir_info(ctx, ino); if (dx_dir && dx_dir->numblocks) { if (db->blockcnt >= dx_dir->numblocks) { @@ -1055,13 +1218,17 @@ inline_read_fail: root = (struct ext2_dx_root_info *) (buf + 24); dx_db->type = DX_DIRBLOCK_ROOT; dx_db->flags |= DX_FLAG_FIRST | DX_FLAG_LAST; + + /* large_dir was set in pass1 if large dirs were found, + * so ext2_dir_htree_level() should now be correct */ if ((root->reserved_zero || root->info_length < 8 || - root->indirect_levels > 1) && + root->indirect_levels >= + ext2_dir_htree_level(fs)) && fix_problem(ctx, PR_2_HTREE_BAD_ROOT, &cd->pctx)) { clear_htree(ctx, ino); dx_dir->numblocks = 0; - dx_db = 0; + dx_db = NULL; } dx_dir->hashversion = root->hash_version; if ((dx_dir->hashversion <= EXT2_HASH_TEA) && @@ -1073,12 +1240,12 @@ inline_read_fail: (ext2fs_dirent_name_len(dirent) == 0) && (ext2fs_le16_to_cpu(limit->limit) == ((fs->blocksize - (8 + dx_csum_size)) / - sizeof(struct ext2_dx_entry)))) + sizeof(struct ext2_dx_entry)))) { dx_db->type = DX_DIRBLOCK_NODE; - is_leaf = 0; + } + is_leaf = dx_db ? (dx_db->type == DX_DIRBLOCK_LEAF) : 0; } out_htree: -#endif /* ENABLE_HTREE */ /* Leaf node with no space for csum? Rebuild dirs in pass 3A. */ if (is_leaf && !inline_data_size && failed_csum && @@ -1113,15 +1280,27 @@ skip_checksum: } else max_block_size = fs->blocksize - de_csum_size; - if (ctx->encrypted_dirs) - encrypted = ext2fs_u32_list_test(ctx->encrypted_dirs, ino); + dir_encpolicy_id = find_encryption_policy(ctx, ino); + + if (cf_dir) { + dict_init(&de_dict, DICTCOUNT_T_MAX, dict_de_cf_cmp); + dict_set_cmp_context(&de_dict, (void *)ctx->fs->encoding); + } else { + dict_init(&de_dict, DICTCOUNT_T_MAX, dict_de_cmp); + } + if (ctx->casefolded_dirs) + casefolded = ext2fs_u32_list_test(ctx->casefolded_dirs, ino); + hash_in_dirent = (casefolded && + (dir_encpolicy_id != NO_ENCRYPTION_POLICY)); - dict_init(&de_dict, DICTCOUNT_T_MAX, dict_de_cmp); prev = 0; do { dgrp_t group; ext2_ino_t first_unused_inode; unsigned int name_len; + /* csum entry is not checked here, so don't worry about it */ + int extended = (dot_state > 1) && hash_in_dirent; + int min_dir_len = ext2fs_dir_rec_len(1, extended); problem = 0; if (!inline_data_size || dot_state > 1) { @@ -1131,15 +1310,16 @@ skip_checksum: * force salvaging this dir. */ if (max_block_size - offset < EXT2_DIR_ENTRY_HEADER_LEN) - rec_len = EXT2_DIR_REC_LEN(1); + rec_len = ext2fs_dir_rec_len(1, extended); else (void) ext2fs_get_rec_len(fs, dirent, &rec_len); cd->pctx.dirent = dirent; cd->pctx.num = offset; if ((offset + rec_len > max_block_size) || - (rec_len < 12) || + (rec_len < min_dir_len) || ((rec_len % 4) != 0) || - ((ext2fs_dirent_name_len(dirent) + EXT2_DIR_ENTRY_HEADER_LEN) > rec_len)) { + ((ext2fs_dir_rec_len(ext2fs_dirent_name_len(dirent), + extended)) > rec_len)) { if (fix_problem(ctx, PR_2_DIR_CORRUPTED, &cd->pctx)) { #ifdef WORDS_BIGENDIAN @@ -1172,7 +1352,8 @@ skip_checksum: #endif salvage_directory(fs, dirent, prev, &offset, - max_block_size); + max_block_size, + hash_in_dirent); #ifdef WORDS_BIGENDIAN if (need_reswab) { (void) ext2fs_get_rec_len(fs, @@ -1378,24 +1559,49 @@ skip_checksum: } } - if (!encrypted && check_name(ctx, dirent, ino, &cd->pctx)) - dir_modified++; - if (check_filetype(ctx, dirent, ino, &cd->pctx)) dir_modified++; -#ifdef ENABLE_HTREE + if (dir_encpolicy_id != NO_ENCRYPTION_POLICY) { + /* Encrypted directory */ + if (dot_state > 1 && + check_encrypted_dirent(ctx, dirent, + dir_encpolicy_id, + &cd->pctx)) { + dirent->inode = 0; + dir_modified++; + goto next; + } + } else if (cf_dir) { + /* Casefolded directory */ + if (encoded_check_name(ctx, dirent, &cd->pctx)) + dir_modified++; + } else { + /* Unencrypted and uncasefolded directory */ + if (check_name(ctx, dirent, &cd->pctx)) + dir_modified++; + } + if (dx_db) { - get_filename_hash(fs, encrypted, dx_dir->hashversion, - dirent->name, - ext2fs_dirent_name_len(dirent), - &hash, 0); + if (dx_dir->casefolded_hash) + hash_flags = EXT4_CASEFOLD_FL; + + if (dx_dir->hashversion == EXT2_HASH_SIPHASH) { + if (dot_state > 1) + hash = EXT2_DIRENT_HASH(dirent); + } else { + ext2fs_dirhash2(dx_dir->hashversion, + dirent->name, + ext2fs_dirent_name_len(dirent), + fs->encoding, hash_flags, + fs->super->s_hash_seed, + &hash, 0); + } if (hash < dx_db->min_hash) dx_db->min_hash = hash; if (hash > dx_db->max_hash) dx_db->max_hash = hash; } -#endif /* * If this is a directory, then mark its parent in its @@ -1471,7 +1677,6 @@ skip_checksum: #if 0 printf("\n"); #endif -#ifdef ENABLE_HTREE if (dx_db) { #ifdef DX_DEBUG printf("db_block %d, type %d, min_hash 0x%0x, max_hash 0x%0x\n", @@ -1483,7 +1688,6 @@ skip_checksum: (dx_db->type == DX_DIRBLOCK_NODE)) parse_int_node(fs, db, cd, dx_dir, buf, failed_csum); } -#endif /* ENABLE_HTREE */ if (offset != max_block_size) { cd->pctx.num = rec_len + offset - max_block_size; @@ -1495,8 +1699,7 @@ skip_checksum: if (dir_modified) { int flags, will_rehash; /* leaf block with no tail? Rehash dirs later. */ - if (EXT2_HAS_RO_COMPAT_FEATURE(fs->super, - EXT4_FEATURE_RO_COMPAT_METADATA_CSUM) && + if (ext2fs_has_feature_metadata_csum(fs->super) && is_leaf && !inline_data_size && !ext2fs_dirent_has_tail(fs, (struct ext2_dir_entry *)buf)) { @@ -1575,6 +1778,7 @@ abort_free_dict: struct del_block { e2fsck_t ctx; e2_blkcnt_t num; + blk64_t last_cluster; }; /* @@ -1589,20 +1793,26 @@ static int deallocate_inode_block(ext2_filsys fs, void *priv_data) { struct del_block *p = priv_data; + blk64_t cluster = EXT2FS_B2C(fs, *block_nr); + + if (*block_nr == 0) + return 0; - if (HOLE_BLKADDR(*block_nr)) + if (cluster == p->last_cluster) return 0; + + p->last_cluster = cluster; if ((*block_nr < fs->super->s_first_data_block) || (*block_nr >= ext2fs_blocks_count(fs->super))) return 0; - if ((*block_nr % EXT2FS_CLUSTER_RATIO(fs)) == 0) - ext2fs_block_alloc_stats2(fs, *block_nr, -1); + + ext2fs_block_alloc_stats2(fs, *block_nr, -1); p->num++; return 0; } /* - * This fuction deallocates an inode + * This function deallocates an inode */ static void deallocate_inode(e2fsck_t ctx, ext2_ino_t ino, char* block_buf) { @@ -1623,7 +1833,7 @@ static void deallocate_inode(e2fsck_t ctx, ext2_ino_t ino, char* block_buf) ext2fs_inode_alloc_stats2(fs, ino, -1, LINUX_S_ISDIR(inode.i_mode)); if (ext2fs_file_acl_block(fs, &inode) && - (fs->super->s_feature_compat & EXT2_FEATURE_COMPAT_EXT_ATTR)) { + ext2fs_has_feature_xattr(fs->super)) { pctx.errcode = ext2fs_adjust_ea_refcount3(fs, ext2fs_file_acl_block(fs, &inode), block_buf, -1, &count, ino); @@ -1651,12 +1861,16 @@ static void deallocate_inode(e2fsck_t ctx, ext2_ino_t ino, char* block_buf) if (inode.i_flags & EXT4_INLINE_DATA_FL) goto clear_inode; - if (LINUX_S_ISREG(inode.i_mode) && - ext2fs_needs_large_file_feature(EXT2_I_SIZE(&inode))) - ctx->large_files--; + if (ext2fs_needs_large_file_feature(EXT2_I_SIZE(&inode))) { + if (LINUX_S_ISREG(inode.i_mode)) + ctx->large_files--; + else if (LINUX_S_ISDIR(inode.i_mode)) + ctx->large_dirs--; + } del_block.ctx = ctx; del_block.num = 0; + del_block.last_cluster = 0; pctx.errcode = ext2fs_block_iterate3(fs, ino, 0, block_buf, deallocate_inode_block, &del_block); @@ -1672,7 +1886,7 @@ clear_inode: } /* - * This fuction clears the htree flag on an inode + * This function clears the htree flag on an inode */ static void clear_htree(e2fsck_t ctx, ext2_ino_t ino) { @@ -1705,7 +1919,7 @@ int e2fsck_process_bad_inode(e2fsck_t ctx, ext2_ino_t dir, pctx.inode = &inode; if (ext2fs_file_acl_block(fs, &inode) && - !(fs->super->s_feature_compat & EXT2_FEATURE_COMPAT_EXT_ATTR)) { + !ext2fs_has_feature_xattr(fs->super)) { if (fix_problem(ctx, PR_2_FILE_ACL_ZERO, &pctx)) { ext2fs_file_acl_block_set(fs, &inode, 0); inode_modified++; @@ -1782,8 +1996,7 @@ int e2fsck_process_bad_inode(e2fsck_t ctx, ext2_ino_t dir, } if ((fs->super->s_creator_os == EXT2_OS_LINUX) && - !(fs->super->s_feature_ro_compat & - EXT4_FEATURE_RO_COMPAT_HUGE_FILE) && + !ext2fs_has_feature_huge_file(fs->super) && (inode.osd2.linux2.l_i_blocks_hi != 0)) { pctx.num = inode.osd2.linux2.l_i_blocks_hi; if (fix_problem(ctx, PR_2_BLOCKS_HI_ZERO, &pctx)) { @@ -1793,8 +2006,7 @@ int e2fsck_process_bad_inode(e2fsck_t ctx, ext2_ino_t dir, } if ((fs->super->s_creator_os == EXT2_OS_LINUX) && - !(fs->super->s_feature_incompat & - EXT4_FEATURE_INCOMPAT_64BIT) && + !ext2fs_has_feature_64bit(fs->super) && inode.osd2.linux2.l_i_file_acl_high != 0) { pctx.num = inode.osd2.linux2.l_i_file_acl_high; if (fix_problem(ctx, PR_2_I_FILE_ACL_HI_ZERO, &pctx)) { @@ -1813,10 +2025,11 @@ int e2fsck_process_bad_inode(e2fsck_t ctx, ext2_ino_t dir, } else not_fixed++; } - if (inode.i_dir_acl && + if (inode.i_size_high && !ext2fs_has_feature_largedir(fs->super) && + inode.i_blocks < 1ULL << (29 - EXT2_BLOCK_SIZE_BITS(fs->super)) && LINUX_S_ISDIR(inode.i_mode)) { - if (fix_problem(ctx, PR_2_DIR_ACL_ZERO, &pctx)) { - inode.i_dir_acl = 0; + if (fix_problem(ctx, PR_2_DIR_SIZE_HIGH_ZERO, &pctx)) { + inode.i_size_high = 0; inode_modified++; } else not_fixed++; @@ -1901,7 +2114,7 @@ static int allocate_dir_block(e2fsck_t ctx, * Update the inode block count */ ext2fs_iblk_add_blocks(fs, &inode, 1); - if (EXT2_I_SIZE(&inode) < (db->blockcnt+1) * fs->blocksize) { + if (EXT2_I_SIZE(&inode) < ((__u64) db->blockcnt+1) * fs->blocksize) { pctx->errcode = ext2fs_inode_size_set(fs, &inode, (db->blockcnt+1) * fs->blocksize); if (pctx->errcode) {