History

f2fs/crypto: fix xts_tweak initialization

Commit 0b81d07790726 ("fs crypto: move per-file encryption from f2fs tree to fs/crypto") moved the f2fs crypto files to fs/crypto/ and renamed the symbol prefixes from "f2fs_" to "fscrypt_" (and from "F2FS_" to just "FS" for preprocessor symbols). Because of the symbol renaming, it's a bit hard to see it as a file move: use git show -M30 0b81d07790726 to lower the rename detection to just 30% similarity and make git show the files as renamed (the header file won't be shown as a rename even then - since all it contains is symbol definitions, it looks almost completely different). Even with the renames showing as renames, the diffs are not all that easy to read, since so much is just the renames. But Eric Biggers noticed that it's not just all renames: the initialization of the xts_tweak had been broken too, using the inode number rather than the page offset. That's not right - it makes the xfs_tweak the same for all pages of each inode. It _might_ make sense to make the xfs_tweak contain both the offset _and_ the inode number, but not just the inode number.

Linus Torvalds committed 10 years ago

Commit 02fc59a1 parent 606c61a1 file · +1 −1Browse files

Unified · Split

fs/crypto/crypto.c+1−1
@@ -170,7 +170,7 @@ static int do_page_crypto(struct inode *inode, · 169 unmodified lines
170 fscrypt_complete, &ecr);170 fscrypt_complete, &ecr);
171 171
172 BUILD_BUG_ON(FS_XTS_TWEAK_SIZE < sizeof(index));172 BUILD_BUG_ON(FS_XTS_TWEAK_SIZE < sizeof(index));
173 memcpy(xts_tweak, &inode->i_ino, sizeof(index));173 memcpy(xts_tweak, &index, sizeof(index));
174 memset(&xts_tweak[sizeof(index)], 0,174 memset(&xts_tweak[sizeof(index)], 0,
175 FS_XTS_TWEAK_SIZE - sizeof(index));175 FS_XTS_TWEAK_SIZE - sizeof(index));
176 176

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t