openharmony/third_party_f2fs-tools
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_f2fs-tools synced 2024-11-23 10:10:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug fix: Fix overflow when calculating block address

Browse Source 
This patch fixes the bug as follows.
"I'm trying to roll out f2fs on top of SDHC card and faced with following
issue - after mounting card I cannot read device root entry. It returns
-1 EINVAL (entry too big).
getdents(3, /* 1 entries */, 32768)     = 24
getdents(3, 0x1082c88, 32768)           = -1 EINVAL (Invalid argument)"
		reported by Ruslan N. Marchenko [me@ruff.mobi].

This bug is easily reproducible and I couldn't have checked the mount
entry cautiously.
Due to the bug, f2fs couldn't get default dentries, . and .., in the root
directory. In the case of other newly created directories, that's fine.

The problem was the overflow during casting variables while calculating the
block address of the root dentry block.
In order to avoid that, I simply split the equation under consideration of
the casting issue.

Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
This commit is contained in:
Jaegeuk Kim 2012-11-13 16:32:44 +09:00
parent bbf6e62360
commit c6ff6d09de
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
mkfs/f2fs_format.c
View File

@ -709,8 +709,8 @@ static int8_t f2fs_init_nat_area(void)
return -1; return -1;
} }
nat_seg_blk_offset = le32_to_cpu(super_block.nat_blkaddr) * nat_seg_blk_offset = le32_to_cpu(super_block.nat_blkaddr);
blk_size_bytes; nat_seg_blk_offset *= blk_size_bytes;
for (index = 0; for (index = 0;
index < (le32_to_cpu(super_block.segment_count_nat) / 2); index < (le32_to_cpu(super_block.segment_count_nat) / 2);
@ -830,8 +830,8 @@ static int8_t f2fs_write_check_point_pack(void)
le32_to_cpu(ckp->checksum_offset))) = crc; le32_to_cpu(ckp->checksum_offset))) = crc;
blk_size_bytes = 1 << le32_to_cpu(super_block.log_blocksize); blk_size_bytes = 1 << le32_to_cpu(super_block.log_blocksize);
cp_seg_blk_offset = cp_seg_blk_offset = le32_to_cpu(super_block.segment0_blkaddr);
le32_to_cpu(super_block.segment0_blkaddr) * blk_size_bytes; cp_seg_blk_offset *= blk_size_bytes;
if (writetodisk(f2fs_params.fd, ckp, cp_seg_blk_offset, if (writetodisk(f2fs_params.fd, ckp, cp_seg_blk_offset,
F2FS_CP_BLOCK_SIZE) < 0) { F2FS_CP_BLOCK_SIZE) < 0) {
@ -997,8 +997,7 @@ static int8_t f2fs_write_super_block(void)
static int8_t f2fs_write_root_inode(void) static int8_t f2fs_write_root_inode(void)
{ {
struct f2fs_node *raw_node = NULL; struct f2fs_node *raw_node = NULL;
u_int32_t blk_size_bytes; u_int64_t blk_size_bytes, data_blk_nor;
u_int64_t data_blk_nor;
u_int64_t main_area_node_seg_blk_offset = 0; u_int64_t main_area_node_seg_blk_offset = 0;
raw_node = calloc(sizeof(struct f2fs_node), 1); raw_node = calloc(sizeof(struct f2fs_node), 1);
@ -1074,8 +1073,7 @@ static int8_t f2fs_write_root_inode(void)
static int8_t f2fs_update_nat_root(void) static int8_t f2fs_update_nat_root(void)
{ {
struct f2fs_nat_block *nat_blk = NULL; struct f2fs_nat_block *nat_blk = NULL;
u_int32_t blk_size_bytes; u_int64_t blk_size_bytes, nat_seg_blk_offset = 0;
u_int64_t nat_seg_blk_offset = 0;
nat_blk = calloc(sizeof(struct f2fs_nat_block), 1); nat_blk = calloc(sizeof(struct f2fs_nat_block), 1);
if(nat_blk == NULL) { if(nat_blk == NULL) {
@ -1098,9 +1096,8 @@ static int8_t f2fs_update_nat_root(void)
nat_blk->entries[super_block.meta_ino].ino = super_block.meta_ino; nat_blk->entries[super_block.meta_ino].ino = super_block.meta_ino;
blk_size_bytes = 1 << le32_to_cpu(super_block.log_blocksize); blk_size_bytes = 1 << le32_to_cpu(super_block.log_blocksize);
nat_seg_blk_offset = le32_to_cpu(super_block.nat_blkaddr);
nat_seg_blk_offset = le32_to_cpu(super_block.nat_blkaddr) * nat_seg_blk_offset *= blk_size_bytes;
blk_size_bytes;
if (writetodisk(f2fs_params.fd, nat_blk, nat_seg_blk_offset, if (writetodisk(f2fs_params.fd, nat_blk, nat_seg_blk_offset,
sizeof(struct f2fs_nat_block)) < 0) { sizeof(struct f2fs_nat_block)) < 0) {
@ -1120,8 +1117,7 @@ static int8_t f2fs_update_nat_root(void)
static int8_t f2fs_add_default_dentry_root(void) static int8_t f2fs_add_default_dentry_root(void)
{ {
struct f2fs_dentry_block *dent_blk = NULL; struct f2fs_dentry_block *dent_blk = NULL;
u_int32_t blk_size_bytes; u_int64_t blk_size_bytes, data_blk_offset = 0;
u_int64_t data_blk_offset = 0;
dent_blk = calloc(sizeof(struct f2fs_dentry_block), 1); dent_blk = calloc(sizeof(struct f2fs_dentry_block), 1);
if(dent_blk == NULL) { if(dent_blk == NULL) {
@ -1144,9 +1140,10 @@ static int8_t f2fs_add_default_dentry_root(void)
/* bitmap for . and .. */ /* bitmap for . and .. */
dent_blk->dentry_bitmap[0] = (1 << 1) | (1 << 0); dent_blk->dentry_bitmap[0] = (1 << 1) | (1 << 0);
blk_size_bytes = 1 << le32_to_cpu(super_block.log_blocksize); blk_size_bytes = 1 << le32_to_cpu(super_block.log_blocksize);
data_blk_offset = (le32_to_cpu(super_block.main_blkaddr) + data_blk_offset = le32_to_cpu(super_block.main_blkaddr);
f2fs_params.cur_seg[CURSEG_HOT_DATA] * data_blk_offset += f2fs_params.cur_seg[CURSEG_HOT_DATA] *
f2fs_params.blks_per_seg) * blk_size_bytes; f2fs_params.blks_per_seg;
data_blk_offset *= blk_size_bytes;
if (writetodisk(f2fs_params.fd, dent_blk, data_blk_offset, if (writetodisk(f2fs_params.fd, dent_blk, data_blk_offset,
sizeof(struct f2fs_dentry_block)) < 0) { sizeof(struct f2fs_dentry_block)) < 0) {