OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
41d5319
)
fscrypt: Use correct index in decrypt path.
author
David Gstir
<david@sigma-star.at>
Tue, 6 Dec 2016 22:53:53 +0000
(23:53 +0100)
committer
Theodore Ts'o
<tytso@mit.edu>
Sun, 11 Dec 2016 21:26:10 +0000
(16:26 -0500)
Actually use the fs-provided index instead of always using page->index
which is only set for page-cache pages.
Fixes:
9c4bb8a3a9b4
("fscrypt: Let fs select encryption index/tweak")
Signed-off-by: David Gstir <david@sigma-star.at>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
fs/crypto/crypto.c
patch
|
blob
|
history
diff --git
a/fs/crypto/crypto.c
b/fs/crypto/crypto.c
index
4d9d221
..
d19a42f
100644
(file)
--- a/
fs/crypto/crypto.c
+++ b/
fs/crypto/crypto.c
@@
-296,7
+296,7
@@
EXPORT_SYMBOL(fscrypt_encrypt_page);
int fscrypt_decrypt_page(const struct inode *inode, struct page *page,
unsigned int len, unsigned int offs, pgoff_t index)
{
- return do_page_crypto(inode, FS_DECRYPT,
page->
index, page, page, len, offs,
+ return do_page_crypto(inode, FS_DECRYPT, index, page, page, len, offs,
GFP_NOFS);
}
EXPORT_SYMBOL(fscrypt_decrypt_page);