swap_inode_data() currently uses swap(inode1->i_version, inode2->i_version) to exchange the two inodes' i_version counters. Because inode->i_version is an atomic64_t, swapping the structs directly performs plain non-atomic loads and stores, which can expose torn 64-bit values to concurrent lockless readers (such as inode_peek_iversion_raw()) on 32-bit SMP systems. Exchange the raw i_version values using inode_peek_iversion_raw() and inode_set_iversion_raw() instead, and update test_swap_inode_data_and_seed() in fs/ext4/ioctl-test.c to verify full 64-bit i_version values across both swaps. Fixes: f02a9ad1f15d ("fs: handle inode->i_version more efficiently") Cc: stable@kernel.org Signed-off-by: Theodore Ts'o --- fs/ext4/ioctl-test.c | 14 ++++++++++---- fs/ext4/ioctl.c | 5 ++++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/fs/ext4/ioctl-test.c b/fs/ext4/ioctl-test.c index f24102f8dbd9..710e9ea51186 100644 --- a/fs/ext4/ioctl-test.c +++ b/fs/ext4/ioctl-test.c @@ -1140,8 +1140,8 @@ static void test_swap_inode_data_and_seed(struct kunit *test) ei2->i_disksize = 0x22000; i_size_write(inode1, 0x10500); i_size_write(inode2, 0x20500); - inode_set_iversion_raw(inode1, 10); - inode_set_iversion_raw(inode2, 20); + inode_set_iversion_raw(inode1, 0x123456789abcdef0ULL); + inode_set_iversion_raw(inode2, 0xfedcba9876543210ULL); inode_set_atime_to_ts(inode1, at1); inode_set_atime_to_ts(inode2, at2); inode_set_mtime_to_ts(inode1, mt1); @@ -1164,8 +1164,10 @@ static void test_swap_inode_data_and_seed(struct kunit *test) KUNIT_EXPECT_EQ(test, ei2->i_disksize, (loff_t)0x11000); KUNIT_EXPECT_EQ(test, i_size_read(inode1), (loff_t)0x20500); KUNIT_EXPECT_EQ(test, i_size_read(inode2), (loff_t)0x10500); - KUNIT_EXPECT_EQ(test, inode_peek_iversion_raw(inode1), 20ULL); - KUNIT_EXPECT_EQ(test, inode_peek_iversion_raw(inode2), 10ULL); + KUNIT_EXPECT_EQ(test, inode_peek_iversion_raw(inode1), + 0xfedcba9876543210ULL); + KUNIT_EXPECT_EQ(test, inode_peek_iversion_raw(inode2), + 0x123456789abcdef0ULL); KUNIT_EXPECT_EQ(test, inode_get_atime_sec(inode1), 2000LL); KUNIT_EXPECT_EQ(test, inode_get_mtime_sec(inode1), 4000LL); KUNIT_EXPECT_EQ(test, ei1->i_es_all_nr, 0U); @@ -1181,6 +1183,10 @@ static void test_swap_inode_data_and_seed(struct kunit *test) KUNIT_EXPECT_EQ(test, ei2->i_flags, (u32)EXT4_NOATIME_FL); KUNIT_EXPECT_EQ(test, ei1->i_disksize, (loff_t)0x11000); KUNIT_EXPECT_EQ(test, i_size_read(inode1), (loff_t)0x10500); + KUNIT_EXPECT_EQ(test, inode_peek_iversion_raw(inode1), + 0x123456789abcdef0ULL); + KUNIT_EXPECT_EQ(test, inode_peek_iversion_raw(inode2), + 0xfedcba9876543210ULL); /* ext4_reset_inode_seed with and without metadata_csum */ inode1->i_ino = 42; diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c index b279ffe1d621..180e7906b086 100644 --- a/fs/ext4/ioctl.c +++ b/fs/ext4/ioctl.c @@ -331,11 +331,14 @@ static void swap_inode_data(struct inode *inode1, struct inode *inode2) struct ext4_inode_info *ei2; unsigned long tmp; struct timespec64 ts1, ts2; + u64 iversion; ei1 = EXT4_I(inode1); ei2 = EXT4_I(inode2); - swap(inode1->i_version, inode2->i_version); + iversion = inode_peek_iversion_raw(inode1); + inode_set_iversion_raw(inode1, inode_peek_iversion_raw(inode2)); + inode_set_iversion_raw(inode2, iversion); ts1 = inode_get_atime(inode1); ts2 = inode_get_atime(inode2); -- 2.56.1.708.g77570a6a1d-goog