[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1480630498-19201-2-git-send-email-richard@nod.at>
Date: Thu, 1 Dec 2016 23:14:53 +0100
From: Richard Weinberger <richard@....at>
To: linux-mtd@...ts.infradead.org
Cc: david@...ma-star.at, tytso@....edu, dedekind1@...il.com,
ebiggers@...gle.com, mhalcrow@...gle.com, adrian.hunter@...el.com,
linux-kernel@...r.kernel.org, hch@...radead.org,
linux-fsdevel@...r.kernel.org, jaegeuk@...nel.org,
dengler@...utronix.de, sbabic@...x.de, wd@...x.de,
Richard Weinberger <richard@....at>
Subject: [PATCH 1/6] fscrypt: Use correct index in decrypt path.
From: David Gstir <david@...ma-star.at>
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@...ma-star.at>
Signed-off-by: Richard Weinberger <richard@....at>
---
fs/crypto/crypto.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/crypto/crypto.c b/fs/crypto/crypto.c
index b6029785714c..3c1124beae28 100644
--- 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);
--
2.7.3
Powered by blists - more mailing lists