mirror of
https://github.com/torvalds/linux.git
synced 2026-09-22 12:44:03 +02:00
f2fs: fix valid block count leak on data block allocation failure
In __allocate_data_block(), when allocating a new data block
(dn->data_blkaddr == NULL_ADDR), inc_valid_block_count() is
called first to increment total_valid_block_count and i_blocks.
If the subsequent f2fs_allocate_data_block() fails, the function
returns the error directly without rolling back the
already-incremented block counts, causing a permanent leak.
Fix this by calling dec_valid_block_count() to undo the
increment before returning the error. The condition
old_blkaddr == NULL_ADDR precisely identifies the case where
inc_valid_block_count() was called.
Fixes: 7d009e048d ("f2fs: fix to handle segment allocation failure correctly")
Cc: <stable@vger.kernel.org>
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Chen Changcheng <chenchangcheng@kylinos.cn>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
This commit is contained in:
parent
8e4692c6c1
commit
0f9af07ecc
|
|
@ -1552,8 +1552,11 @@ static int __allocate_data_block(struct dnode_of_data *dn, int seg_type)
|
|||
old_blkaddr = dn->data_blkaddr;
|
||||
err = f2fs_allocate_data_block(sbi, NULL, old_blkaddr,
|
||||
&dn->data_blkaddr, &sum, seg_type, NULL);
|
||||
if (err)
|
||||
if (err) {
|
||||
if (old_blkaddr == NULL_ADDR)
|
||||
dec_valid_block_count(sbi, dn->inode, count);
|
||||
return err;
|
||||
}
|
||||
|
||||
if (GET_SEGNO(sbi, old_blkaddr) != NULL_SEGNO)
|
||||
f2fs_invalidate_internal_cache(sbi, old_blkaddr, 1);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user