summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Ian King <colin.king@canonical.com>2013-10-24 14:08:07 +0000
committerTyler Hicks <tyhicks@canonical.com>2013-10-24 12:36:30 -0700
commit43b7c6c6a4e3916edd186ceb61be0c67d1e0969e (patch)
tree422f444513a00a3f6d336ec448af816e1e45180a
parent3edc8376c06133e3386265a824869cad03a4efd4 (diff)
downloadblackbird-op-linux-43b7c6c6a4e3916edd186ceb61be0c67d1e0969e.tar.gz
blackbird-op-linux-43b7c6c6a4e3916edd186ceb61be0c67d1e0969e.zip
eCryptfs: fix 32 bit corruption issue
Shifting page->index on 32 bit systems was overflowing, causing data corruption of > 4GB files. Fix this by casting it first. https://launchpad.net/bugs/1243636 Signed-off-by: Colin Ian King <colin.king@canonical.com> Reported-by: Lars Duesing <lars.duesing@camelotsweb.de> Cc: stable@vger.kernel.org # v3.11+ Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
-rw-r--r--fs/ecryptfs/crypto.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c
index c88e355f7635..000eae2782b6 100644
--- a/fs/ecryptfs/crypto.c
+++ b/fs/ecryptfs/crypto.c
@@ -408,7 +408,7 @@ static loff_t lower_offset_for_page(struct ecryptfs_crypt_stat *crypt_stat,
struct page *page)
{
return ecryptfs_lower_header_size(crypt_stat) +
- (page->index << PAGE_CACHE_SHIFT);
+ ((loff_t)page->index << PAGE_CACHE_SHIFT);
}
/**
OpenPOWER on IntegriCloud