lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-Id: <1341150538-32047-34-git-send-email-wenqing.lz@taobao.com> Date: Sun, 1 Jul 2012 21:48:56 +0800 From: Zheng Liu <gnehzuil.liu@...il.com> To: linux-ext4@...r.kernel.org Cc: Zheng Liu <wenqing.lz@...bao.com> Subject: [PATCH 33/35 v3] e2fsck: check inline data in pass2 From: Zheng Liu <wenqing.lz@...bao.com> Signed-off-by: Zheng Liu <wenqing.lz@...bao.com> --- e2fsck/pass2.c | 64 +++++++++++++++++++++++++++++++++++++-------- lib/ext2fs/inline_data.c | 4 +- 2 files changed, 54 insertions(+), 14 deletions(-) diff --git a/e2fsck/pass2.c b/e2fsck/pass2.c index e28af61..7267409 100644 --- a/e2fsck/pass2.c +++ b/e2fsck/pass2.c @@ -725,6 +725,15 @@ static void salvage_directory(ext2_filsys fs, } } +static int is_last_entry(ext2_filsys fs, ext2_ino_t ino, unsigned int offset, + int csum_size) +{ + if (ext2fs_has_inline_data(fs, ino)) + return (offset < ext2fs_inline_data_size(fs, ino)); + else + return (offset < fs->blocksize - csum_size); +} + static int check_dir_block(ext2_filsys fs, struct ext2_db_entry2 *db, void *priv_data) @@ -734,6 +743,7 @@ static int check_dir_block(ext2_filsys fs, struct dx_dirblock_info *dx_db = 0; #endif /* ENABLE_HTREE */ struct ext2_dir_entry *dirent, *prev; + struct ext2_inode inode; ext2_dirhash_t hash; unsigned int offset = 0; int dir_modified = 0; @@ -756,6 +766,7 @@ static int check_dir_block(ext2_filsys fs, int dx_csum_size = 0, de_csum_size = 0; int failed_csum = 0; int is_leaf = 1; + int has_inline_data = 0; cd = (struct check_dir_struct *) priv_data; buf = cd->buf; @@ -787,7 +798,8 @@ static int check_dir_block(ext2_filsys fs, cd->pctx.dirent = 0; cd->pctx.num = 0; - if (db->blk == 0) { + /* We don't need to allocate dir blocks for inline_data dir */ + if (db->blk == 0 && !ext2fs_has_inline_data(fs, db->ino)) { if (allocate_dir_block(ctx, db, buf, &cd->pctx)) return 0; block_nr = db->blk; @@ -808,7 +820,20 @@ static int check_dir_block(ext2_filsys fs, #endif ehandler_operation(_("reading directory block")); - cd->pctx.errcode = ext2fs_read_dir_block4(fs, block_nr, buf, 0, ino); + ext2fs_read_inode(fs, ino, &inode); + + if (EXT2_HAS_INCOMPAT_FEATURE(fs->super, + EXT4_FEATURE_INCOMPAT_INLINE_DATA)) + has_inline_data = (inode.i_flags & EXT4_INLINE_DATA_FL); + + if (has_inline_data) { + cd->pctx.errcode = ext2fs_read_dir_inline_data(fs, ino, buf); + if (!cd->pctx.errcode) + cd->pctx.errcode = ext2fs_read_dir_inline_data_more(fs, + ino, buf); + } else + cd->pctx.errcode = ext2fs_read_dir_block4(fs, block_nr, buf, + 0, ino); ehandler_operation(0); if (cd->pctx.errcode == EXT2_ET_DIR_CORRUPTED) cd->pctx.errcode = 0; /* We'll handle this ourselves */ @@ -879,7 +904,7 @@ out_htree: #endif /* ENABLE_HTREE */ /* Verify checksum. */ - if (is_leaf && de_csum_size) { + if (is_leaf && de_csum_size && !has_inline_data) { /* No space for csum? Rebuild dirs in pass 3A. */ if (!ext2fs_dirent_has_tail(fs, (struct ext2_dir_entry *)buf)) { de_csum_size = 0; @@ -1173,7 +1198,7 @@ skip_checksum: (void) ext2fs_get_rec_len(fs, dirent, &rec_len); offset += rec_len; dot_state++; - } while (offset < fs->blocksize - de_csum_size); + } while (is_last_entry(fs, ino, offset, de_csum_size)); #if 0 printf("\n"); #endif @@ -1191,12 +1216,24 @@ skip_checksum: } #endif /* ENABLE_HTREE */ - if (offset != fs->blocksize - de_csum_size) { - cd->pctx.num = rec_len - (fs->blocksize - de_csum_size) + - offset; - if (fix_problem(ctx, PR_2_FINAL_RECLEN, &cd->pctx)) { - dirent->rec_len = cd->pctx.num; - dir_modified++; + if (!has_inline_data) { + if (offset != fs->blocksize - de_csum_size) { + cd->pctx.num = rec_len - + (fs->blocksize - de_csum_size) + + offset; + if (fix_problem(ctx, PR_2_FINAL_RECLEN, &cd->pctx)) { + dirent->rec_len = cd->pctx.num; + dir_modified++; + } + } + } else { + if (offset != ext2fs_inline_data_size(fs, ino)) { + cd->pctx.num = rec_len + offset - + ext2fs_inline_data_size(fs, ino); + if (fix_problem(ctx, PR_2_FINAL_RECLEN, &cd->pctx)) { + dirent->rec_len = cd->pctx.num; + dir_modified++; + } } } if (dir_modified) { @@ -1210,8 +1247,11 @@ skip_checksum: write_and_fix: if (e2fsck_dir_will_be_rehashed(ctx, ino)) ctx->fs->flags |= EXT2_FLAG_IGNORE_CSUM_ERRORS; - cd->pctx.errcode = ext2fs_write_dir_block4(fs, block_nr, buf, - 0, ino); + if (inode.i_flags & EXT4_INLINE_DATA_FL) + cd->pctx.errcode = ext2fs_write_dir_inline_data(fs, ino, buf); + else + cd->pctx.errcode = ext2fs_write_dir_block4(fs, + block_nr, buf, 0, ino); if (e2fsck_dir_will_be_rehashed(ctx, ino)) ctx->fs->flags &= ~EXT2_FLAG_IGNORE_CSUM_ERRORS; if (cd->pctx.errcode) { diff --git a/lib/ext2fs/inline_data.c b/lib/ext2fs/inline_data.c index 59483a6..3adab3c 100644 --- a/lib/ext2fs/inline_data.c +++ b/lib/ext2fs/inline_data.c @@ -575,7 +575,7 @@ int ext2fs_inline_data_in_extra(ext2_filsys fs, ext2_ino_t ino) ext2fs_get_mem(EXT2_INODE_SIZE(fs->super), &inode); ext2fs_read_inode_full(fs, ino, inode, EXT2_INODE_SIZE(fs->super)); - ext2fs_iget_extra_inode(fs, inode, &idata); + ext2fs_iget_extra_inode(fs, (void *)inode, &idata); ext2fs_free_mem(&inode); if (idata.inline_off == 0 || idata.inline_size == EXT4_MIN_INLINE_DATA_SIZE) @@ -592,7 +592,7 @@ int ext2fs_inline_data_size(ext2_filsys fs, ext2_ino_t ino) inode = (struct ext2_inode *) malloc(EXT2_INODE_SIZE(fs->super)); ext2fs_read_inode_full(fs, ino, inode, EXT2_INODE_SIZE(fs->super)); - ext2fs_iget_extra_inode(fs, inode, &idata); + ext2fs_iget_extra_inode(fs, (void *)inode, &idata); free(inode); if (idata.inline_off == 0) return 0; -- 1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists