2015-07-02 03:38:08

by Theodore Ts'o

Subject: [PATCH] ext4: fix fencepost error in lazytime optimization

Commit 8f4d8558391: "ext4: fix lazytime optimization" was not a
complete fix. In the case where the inode number is a multiple of 16,
and we could still end up updating an inode with dirty timestamps
written to the wrong inode on disk. Oops.

This can be easily reproduced by using generic/005 with a file system
with metadata_csum and lazytime enabled.

Signed-off-by: Theodore Ts'o <[email protected]>
Cc: [email protected]
---
fs/ext4/inode.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index e057c6f..0b4dd57 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -4348,7 +4348,7 @@ static void ext4_update_other_inodes_time(struct super_block *sb,
int inode_size = EXT4_INODE_SIZE(sb);

oi.orig_ino = orig_ino;
- ino = (orig_ino & ~(inodes_per_block - 1)) + 1;
+ ino = ((orig_ino - 1) & ~(inodes_per_block - 1)) + 1;
for (i = 0; i < inodes_per_block; i++, ino++, buf += inode_size) {
if (ino == orig_ino)
continue;
--
2.3.0

2015-07-03 12:35:59

by Jörg-Volker Peetz

Subject: Re: [PATCH] ext4: fix fencepost error in lazytime optimization

Theodore Ts'o wrote on 07/02/2015 05:38:
> Commit 8f4d8558391: "ext4: fix lazytime optimization" was not a
> complete fix. In the case where the inode number is a multiple of 16,
> and we could still end up updating an inode with dirty timestamps
> written to the wrong inode on disk. Oops.
>
<snip>
> - ino = (orig_ino & ~(inodes_per_block - 1)) + 1;
> + ino = ((orig_ino - 1) & ~(inodes_per_block - 1)) + 1;

Maybe, a comment stating what should be accomplished here would help?
--
Regards,
J?rg.