Skip to content

Commit 5471834

Browse files
Cen ZhangJaegeuk Kim
authored andcommitted
f2fs: add READ_ONCE() for i_blocks in f2fs_update_inode()
f2fs_update_inode() reads inode->i_blocks without holding i_lock to serialize it to the on-disk inode, while concurrent truncate or allocation paths may modify i_blocks under i_lock. Since blkcnt_t is u64, this risks torn reads on 32-bit architectures. Following the approach in ext4_inode_blocks_set(), add READ_ONCE() to prevent potential compiler-induced tearing. Fixes: 19f99ce ("f2fs: add core inode operations") Cc: stable@vger.kernel.org Signed-off-by: Cen Zhang <zzzccc427@gmail.com> Reviewed-by: Chao Yu <chao@kernel.org> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
1 parent 1e134c3 commit 5471834

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

fs/f2fs/inode.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,7 @@ void f2fs_update_inode(struct inode *inode, struct folio *node_folio)
687687
ri->i_uid = cpu_to_le32(i_uid_read(inode));
688688
ri->i_gid = cpu_to_le32(i_gid_read(inode));
689689
ri->i_links = cpu_to_le32(inode->i_nlink);
690-
ri->i_blocks = cpu_to_le64(SECTOR_TO_BLOCK(inode->i_blocks) + 1);
690+
ri->i_blocks = cpu_to_le64(SECTOR_TO_BLOCK(READ_ONCE(inode->i_blocks)) + 1);
691691

692692
if (!f2fs_is_atomic_file(inode) ||
693693
is_inode_flag_set(inode, FI_ATOMIC_COMMITTED))

0 commit comments

Comments
 (0)