X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=e2fsck%2Fpass2.c;h=bd974c551b7450dd8f2537ab8e44775430dc7574;hb=225e5d093b519f9dbe9fcaacd995426f0e5194f6;hp=e922876d32ffd565f7ebb2a95760380c3d382341;hpb=1d9ec88df621a74abb2a0430b474cac3c4fc998a;p=tools%2Fe2fsprogs.git diff --git a/e2fsck/pass2.c b/e2fsck/pass2.c index e922876..bd974c5 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() */ @@ -71,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 { @@ -88,7 +92,7 @@ struct check_dir_struct { static void update_parents(struct dx_dir_info *dx_dir, int type) { struct dx_dirblock_info *dx_db, *dx_parent, *dx_previous; - int b; + blk_t b; for (b = 0, dx_db = dx_dir->dx_block; b < dx_dir->numblocks; @@ -129,9 +133,10 @@ void e2fsck_pass2(e2fsck_t ctx) #endif struct check_dir_struct cd; struct dx_dir_info *dx_dir; - struct dx_dirblock_info *dx_db, *dx_parent; - 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, @@ -284,9 +289,14 @@ 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); @@ -310,10 +320,10 @@ cleanup: } #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]; @@ -322,7 +332,8 @@ 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 EXT2FS_ATTR((unused)), + const void *a, const void *b) { const struct ext2_dir_entry *de_a, *de_b; int a_len, b_len; @@ -338,6 +349,22 @@ 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, + (const unsigned char *) de_a->name, a_len, + (const 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. @@ -380,6 +407,7 @@ static int check_dot(e2fsck_t ctx, int status = 0; int created = 0; problem_t problem = 0; + int ftype = EXT2_FT_DIR; if (!dirent->inode) problem = PR_2_MISSING_DOT; @@ -391,12 +419,14 @@ static int check_dot(e2fsck_t ctx, (void) ext2fs_get_rec_len(ctx->fs, dirent, &rec_len); if (problem) { + if (!ext2fs_has_feature_filetype(ctx->fs->super)) + ftype = EXT2_FT_UNKNOWN; if (fix_problem(ctx, problem, pctx)) { if (rec_len < 12) rec_len = dirent->rec_len = 12; dirent->inode = ino; ext2fs_dirent_set_name_len(dirent, 1); - ext2fs_dirent_set_file_type(dirent, EXT2_FT_UNKNOWN); + ext2fs_dirent_set_file_type(dirent, ftype); dirent->name[0] = '.'; dirent->name[1] = '\0'; status = 1; @@ -417,12 +447,24 @@ static int check_dot(e2fsck_t ctx, nextdir = (struct ext2_dir_entry *) ((char *) dirent + 12); dirent->rec_len = 12; - (void) ext2fs_set_rec_len(ctx->fs, new_len, - nextdir); - nextdir->inode = 0; - ext2fs_dirent_set_name_len(nextdir, 0); - ext2fs_dirent_set_file_type(nextdir, - EXT2_FT_UNKNOWN); + /* if the next entry looks like "..", leave it + * and let check_dotdot() verify the dirent, + * otherwise zap the following entry. */ + if (strncmp(nextdir->name, "..", 3) != 0) { + (void)ext2fs_set_rec_len(ctx->fs, + new_len, + nextdir); + nextdir->inode = 0; + ext2fs_dirent_set_name_len(nextdir, 0); + ext2fs_dirent_set_file_type(nextdir, + ftype); +#ifdef WORDS_BIGENDIAN + } else { + (void) ext2fs_dirent_swab_in2(ctx->fs, + (char *) nextdir, + ctx->fs->blocksize - 12, 0); +#endif + } status = 1; } } @@ -441,6 +483,7 @@ static int check_dotdot(e2fsck_t ctx, { problem_t problem = 0; unsigned int rec_len; + int ftype = EXT2_FT_DIR; if (!dirent->inode) problem = PR_2_MISSING_DOT_DOT; @@ -453,6 +496,8 @@ static int check_dotdot(e2fsck_t ctx, (void) ext2fs_get_rec_len(ctx->fs, dirent, &rec_len); if (problem) { + if (!ext2fs_has_feature_filetype(ctx->fs->super)) + ftype = EXT2_FT_UNKNOWN; if (fix_problem(ctx, problem, pctx)) { if (rec_len < 12) dirent->rec_len = 12; @@ -463,7 +508,7 @@ static int check_dotdot(e2fsck_t ctx, */ dirent->inode = EXT2_ROOT_INO; ext2fs_dirent_set_name_len(dirent, 2); - ext2fs_dirent_set_file_type(dirent, EXT2_FT_UNKNOWN); + ext2fs_dirent_set_file_type(dirent, ftype); dirent->name[0] = '.'; dirent->name[1] = '.'; dirent->name[2] = '\0'; @@ -504,19 +549,41 @@ static int check_name(e2fsck_t ctx, } static int encrypted_check_name(e2fsck_t ctx, - struct ext2_dir_entry *dirent, + 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)) { - dirent->inode = 0; + 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) */ @@ -569,8 +636,8 @@ static void parse_int_node(ext2_filsys fs, 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; @@ -586,10 +653,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); @@ -645,7 +712,7 @@ static void parse_int_node(ext2_filsys fs, #endif 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)) @@ -705,7 +772,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; @@ -730,7 +798,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 >= (int) 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; @@ -742,7 +811,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); @@ -877,6 +946,71 @@ err: return retval; } +/* Return true if this type of file needs encryption */ +static int needs_encryption(e2fsck_t ctx, const struct ext2_dir_entry *dirent) +{ + int filetype = ext2fs_dirent_file_type(dirent); + ext2_ino_t ino = dirent->inode; + struct ext2_inode inode; + + if (filetype != EXT2_FT_UNKNOWN) + return filetype == EXT2_FT_REG_FILE || + filetype == EXT2_FT_DIR || + filetype == EXT2_FT_SYMLINK; + + 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) @@ -931,13 +1065,25 @@ 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; + /* 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; @@ -979,7 +1125,8 @@ static int check_dir_block(ext2_filsys fs, * 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)) + 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) { @@ -1002,7 +1149,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); @@ -1089,6 +1238,9 @@ 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 >= @@ -1148,15 +1300,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, (const 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; + unsigned int min_dir_len = ext2fs_dir_rec_len(1, extended); problem = 0; if (!inline_data_size || dot_state > 1) { @@ -1166,15 +1330,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) || - (((unsigned) 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 @@ -1207,15 +1372,18 @@ skip_checksum: #endif salvage_directory(fs, dirent, prev, &offset, - max_block_size); + max_block_size, + hash_in_dirent); #ifdef WORDS_BIGENDIAN if (need_reswab) { + unsigned int len; + (void) ext2fs_get_rec_len(fs, - dirent, &rec_len); - ext2fs_dirent_swab_in2(fs, - ((char *)dirent) + offset + rec_len, - max_block_size - offset - rec_len, - 0); + dirent, &len); + len += offset; + if (max_block_size > len) + ext2fs_dirent_swab_in2(fs, + ((char *)dirent) + len, max_block_size - len, 0); } #endif dir_modified++; @@ -1413,22 +1581,44 @@ skip_checksum: } } - if (!encrypted && check_name(ctx, dirent, &cd->pctx)) + if (check_filetype(ctx, dirent, ino, &cd->pctx)) dir_modified++; - if (encrypted && (dot_state) > 1 && - encrypted_check_name(ctx, dirent, &cd->pctx)) { - dir_modified++; - goto next; + 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 (check_filetype(ctx, dirent, ino, &cd->pctx)) - dir_modified++; - if (dx_db) { - ext2fs_dirhash(dx_dir->hashversion, dirent->name, - ext2fs_dirent_name_len(dirent), - fs->super->s_hash_seed, &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) @@ -1610,6 +1800,7 @@ abort_free_dict: struct del_block { e2fsck_t ctx; e2_blkcnt_t num; + blk64_t last_cluster; }; /* @@ -1624,14 +1815,20 @@ 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 (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; } @@ -1686,12 +1883,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); @@ -1847,6 +2048,7 @@ int e2fsck_process_bad_inode(e2fsck_t ctx, ext2_ino_t dir, not_fixed++; } 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_SIZE_HIGH_ZERO, &pctx)) { inode.i_size_high = 0;