Skip to content

Commit a2bcf16

Browse files
Cen Zhanggregkh
authored andcommitted
f2fs: add READ_ONCE() for i_blocks in f2fs_update_inode()
commit 5471834 upstream. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent ebeb70e commit a2bcf16

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
@@ -665,7 +665,7 @@ void f2fs_update_inode(struct inode *inode, struct page *node_page)
665665
ri->i_uid = cpu_to_le32(i_uid_read(inode));
666666
ri->i_gid = cpu_to_le32(i_gid_read(inode));
667667
ri->i_links = cpu_to_le32(inode->i_nlink);
668-
ri->i_blocks = cpu_to_le64(SECTOR_TO_BLOCK(inode->i_blocks) + 1);
668+
ri->i_blocks = cpu_to_le64(SECTOR_TO_BLOCK(READ_ONCE(inode->i_blocks)) + 1);
669669

670670
if (!f2fs_is_atomic_file(inode) ||
671671
is_inode_flag_set(inode, FI_ATOMIC_COMMITTED))

0 commit comments

Comments
 (0)