diff options
| author | David Gstir <david@sigma-star.at> | 2016-11-13 22:20:48 +0100 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2016-11-13 20:18:16 -0500 |
| commit | 9c4bb8a3a9b4de21753053d667310c2b7cb39916 (patch) | |
| tree | f384bbd76dfc293f2cc66c770c5ccfdbc42c43c8 /fs/f2fs | |
| parent | 0b93e1b94b86f826d18a2aaf219a53e271274d49 (diff) | |
| download | op-kernel-dev-9c4bb8a3a9b4de21753053d667310c2b7cb39916.zip op-kernel-dev-9c4bb8a3a9b4de21753053d667310c2b7cb39916.tar.gz | |
fscrypt: Let fs select encryption index/tweak
Avoid re-use of page index as tweak for AES-XTS when multiple parts of
same page are encrypted. This will happen on multiple (partial) calls of
fscrypt_encrypt_page on same page.
page->index is only valid for writeback pages.
Signed-off-by: David Gstir <david@sigma-star.at>
Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/f2fs')
| -rw-r--r-- | fs/f2fs/data.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index fac2072..435590c 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -1196,8 +1196,9 @@ int do_write_data_page(struct f2fs_io_info *fio) retry_encrypt: BUG_ON(!PageLocked(fio->page)); fio->encrypted_page = fscrypt_encrypt_page(inode, fio->page, - PAGE_SIZE, 0, - gfp_flags); + PAGE_SIZE, 0, + fio->page->index, + gfp_flags); if (IS_ERR(fio->encrypted_page)) { err = PTR_ERR(fio->encrypted_page); if (err == -ENOMEM) { |
