aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/ecryptfs/crypto.c1
-rw-r--r--fs/ecryptfs/inode.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c
index 391f558eb4d0..4d9db0ed88ea 100644
--- a/fs/ecryptfs/crypto.c
+++ b/fs/ecryptfs/crypto.c
@@ -1603,6 +1603,7 @@ int ecryptfs_read_metadata(struct dentry *ecryptfs_dentry)
1603 ecryptfs_dentry, 1603 ecryptfs_dentry,
1604 ECRYPTFS_VALIDATE_HEADER_SIZE); 1604 ECRYPTFS_VALIDATE_HEADER_SIZE);
1605 if (rc) { 1605 if (rc) {
1606 memset(page_virt, 0, PAGE_CACHE_SIZE);
1606 rc = ecryptfs_read_xattr_region(page_virt, ecryptfs_inode); 1607 rc = ecryptfs_read_xattr_region(page_virt, ecryptfs_inode);
1607 if (rc) { 1608 if (rc) {
1608 printk(KERN_DEBUG "Valid eCryptfs headers not found in " 1609 printk(KERN_DEBUG "Valid eCryptfs headers not found in "
diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
index a50efb18701c..ddbd096c7406 100644
--- a/fs/ecryptfs/inode.c
+++ b/fs/ecryptfs/inode.c
@@ -323,6 +323,7 @@ int ecryptfs_lookup_and_interpose_lower(struct dentry *ecryptfs_dentry,
323 rc = ecryptfs_read_and_validate_header_region(page_virt, 323 rc = ecryptfs_read_and_validate_header_region(page_virt,
324 ecryptfs_dentry->d_inode); 324 ecryptfs_dentry->d_inode);
325 if (rc) { 325 if (rc) {
326 memset(page_virt, 0, PAGE_CACHE_SIZE);
326 rc = ecryptfs_read_and_validate_xattr_region(page_virt, 327 rc = ecryptfs_read_and_validate_xattr_region(page_virt,
327 ecryptfs_dentry); 328 ecryptfs_dentry);
328 if (rc) { 329 if (rc) {