5 files changed, 53 insertions, 42 deletions

diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c
index f6caeb1d1106..8b65f289ee00 100644
--- a/fs/ecryptfs/crypto.c
+++ b/fs/ecryptfs/crypto.c
@@ -946,6 +946,8 @@ static int ecryptfs_copy_mount_wide_sigs_to_inode_sigs(
         list_for_each_entry(global_auth_tok,
                             &mount_crypt_stat->global_auth_tok_list,
                             mount_crypt_stat_list) {
+                if (global_auth_tok->flags & ECRYPTFS_AUTH_TOK_FNEK)
+                        continue;
                 rc = ecryptfs_add_keysig(crypt_stat, global_auth_tok->sig);
                 if (rc) {
                         printk(KERN_ERR "Error adding keysig; rc = [%d]\n", rc);
@@ -1322,14 +1324,13 @@ static int ecryptfs_write_headers_virt(char *page_virt, size_t max,
 }
 
 static int
-ecryptfs_write_metadata_to_contents(struct ecryptfs_crypt_stat *crypt_stat,
-                                    struct dentry *ecryptfs_dentry,
-                                    char *virt)
+ecryptfs_write_metadata_to_contents(struct dentry *ecryptfs_dentry,
+                                    char *virt, size_t virt_len)
 {
         int rc;
 
         rc = ecryptfs_write_lower(ecryptfs_dentry->d_inode, virt,
-                                  0, crypt_stat->num_header_bytes_at_front);
+                                  0, virt_len);
         if (rc)
                 printk(KERN_ERR "%s: Error attempting to write header "
                        "information to lower file; rc = [%d]\n", __func__,
@@ -1339,7 +1340,6 @@ ecryptfs_write_metadata_to_contents(struct ecryptfs_crypt_stat *crypt_stat,
 
 static int
 ecryptfs_write_metadata_to_xattr(struct dentry *ecryptfs_dentry,
-                                 struct ecryptfs_crypt_stat *crypt_stat,
                                  char *page_virt, size_t size)
 {
         int rc;
@@ -1349,6 +1349,17 @@ ecryptfs_write_metadata_to_xattr(struct dentry *ecryptfs_dentry,
         return rc;
 }
 
+static unsigned long ecryptfs_get_zeroed_pages(gfp_t gfp_mask,
+                                               unsigned int order)
+{
+        struct page *page;
+
+        page = alloc_pages(gfp_mask | __GFP_ZERO, order);
+        if (page)
+                return (unsigned long) page_address(page);
+        return 0;
+}
+
 /**
  * ecryptfs_write_metadata
  * @ecryptfs_dentry: The eCryptfs dentry
@@ -1365,7 +1376,9 @@ int ecryptfs_write_metadata(struct dentry *ecryptfs_dentry)
 {
         struct ecryptfs_crypt_stat *crypt_stat =
                 &ecryptfs_inode_to_private(ecryptfs_dentry->d_inode)->crypt_stat;
+        unsigned int order;
         char *virt;
+        size_t virt_len;
         size_t size = 0;
         int rc = 0;
 
@@ -1381,33 +1394,35 @@ int ecryptfs_write_metadata(struct dentry *ecryptfs_dentry)
                 rc = -EINVAL;
                 goto out;
         }
+        virt_len = crypt_stat->num_header_bytes_at_front;
+        order = get_order(virt_len);
         /* Released in this function */
-        virt = (char *)get_zeroed_page(GFP_KERNEL);
+        virt = (char *)ecryptfs_get_zeroed_pages(GFP_KERNEL, order);
         if (!virt) {
                 printk(KERN_ERR "%s: Out of memory\n", __func__);
                 rc = -ENOMEM;
                 goto out;
         }
-        rc = ecryptfs_write_headers_virt(virt, PAGE_CACHE_SIZE, &size,
-                                         crypt_stat, ecryptfs_dentry);
+        rc = ecryptfs_write_headers_virt(virt, virt_len, &size, crypt_stat,
+                                         ecryptfs_dentry);
         if (unlikely(rc)) {
                 printk(KERN_ERR "%s: Error whilst writing headers; rc = [%d]\n",
                        __func__, rc);
                 goto out_free;
         }
         if (crypt_stat->flags & ECRYPTFS_METADATA_IN_XATTR)
-                rc = ecryptfs_write_metadata_to_xattr(ecryptfs_dentry,
-                                                      crypt_stat, virt, size);
+                rc = ecryptfs_write_metadata_to_xattr(ecryptfs_dentry, virt,
+                                                      size);
         else
-                rc = ecryptfs_write_metadata_to_contents(crypt_stat,
-                                                         ecryptfs_dentry, virt);
+                rc = ecryptfs_write_metadata_to_contents(ecryptfs_dentry, virt,
+                                                         virt_len);
         if (rc) {
                 printk(KERN_ERR "%s: Error writing metadata out to lower file; "
                        "rc = [%d]\n", __func__, rc);
                 goto out_free;
         }
 out_free:
-        free_page((unsigned long)virt);
+        free_pages((unsigned long)virt, order);
 out:
         return rc;
 }
@@ -2206,17 +2221,19 @@ int ecryptfs_decode_and_decrypt_filename(char **plaintext_name,
                                          struct dentry *ecryptfs_dir_dentry,
                                          const char *name, size_t name_size)
 {
+        struct ecryptfs_mount_crypt_stat *mount_crypt_stat =
+                &ecryptfs_superblock_to_private(
+                        ecryptfs_dir_dentry->d_sb)->mount_crypt_stat;
         char *decoded_name;
         size_t decoded_name_size;
         size_t packet_size;
         int rc = 0;
 
-        if ((name_size > ECRYPTFS_FNEK_ENCRYPTED_FILENAME_PREFIX_SIZE)
+        if ((mount_crypt_stat->flags & ECRYPTFS_GLOBAL_ENCRYPT_FILENAMES)
+            && !(mount_crypt_stat->flags & ECRYPTFS_ENCRYPTED_VIEW_ENABLED)
+            && (name_size > ECRYPTFS_FNEK_ENCRYPTED_FILENAME_PREFIX_SIZE)
             && (strncmp(name, ECRYPTFS_FNEK_ENCRYPTED_FILENAME_PREFIX,
                         ECRYPTFS_FNEK_ENCRYPTED_FILENAME_PREFIX_SIZE) == 0)) {
-                struct ecryptfs_mount_crypt_stat *mount_crypt_stat =
-                        &ecryptfs_superblock_to_private(
-                                ecryptfs_dir_dentry->d_sb)->mount_crypt_stat;
                 const char *orig_name = name;
                 size_t orig_name_size = name_size;
 
diff --git a/fs/ecryptfs/ecryptfs_kernel.h b/fs/ecryptfs/ecryptfs_kernel.h
index c11fc95714ab..ac749d4d644f 100644
--- a/fs/ecryptfs/ecryptfs_kernel.h
+++ b/fs/ecryptfs/ecryptfs_kernel.h
@@ -328,6 +328,7 @@ struct ecryptfs_dentry_info {
  */
 struct ecryptfs_global_auth_tok {
 #define ECRYPTFS_AUTH_TOK_INVALID 0x00000001
+#define ECRYPTFS_AUTH_TOK_FNEK    0x00000002
         u32 flags;
         struct list_head mount_crypt_stat_list;
         struct key *global_auth_tok_key;
@@ -619,7 +620,6 @@ int ecryptfs_interpose(struct dentry *hidden_dentry,
                        u32 flags);
 int ecryptfs_lookup_and_interpose_lower(struct dentry *ecryptfs_dentry,
                                         struct dentry *lower_dentry,
-                                        struct ecryptfs_crypt_stat *crypt_stat,
                                         struct inode *ecryptfs_dir_inode,
                                         struct nameidata *ecryptfs_nd);
 int ecryptfs_decode_and_decrypt_filename(char **decrypted_name,
@@ -696,7 +696,7 @@ ecryptfs_write_header_metadata(char *virt,
 int ecryptfs_add_keysig(struct ecryptfs_crypt_stat *crypt_stat, char *sig);
 int
 ecryptfs_add_global_auth_tok(struct ecryptfs_mount_crypt_stat *mount_crypt_stat,
-                           char *sig);
+                           char *sig, u32 global_auth_tok_flags);
 int ecryptfs_get_global_auth_tok_for_sig(
         struct ecryptfs_global_auth_tok **global_auth_tok,
         struct ecryptfs_mount_crypt_stat *mount_crypt_stat, char *sig);
diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
index 5697899a168d..55b3145b8072 100644
--- a/fs/ecryptfs/inode.c
+++ b/fs/ecryptfs/inode.c
@@ -246,7 +246,6 @@ out:
  */
 int ecryptfs_lookup_and_interpose_lower(struct dentry *ecryptfs_dentry,
                                         struct dentry *lower_dentry,
-                                        struct ecryptfs_crypt_stat *crypt_stat,
                                         struct inode *ecryptfs_dir_inode,
                                         struct nameidata *ecryptfs_nd)
 {
@@ -254,6 +253,7 @@ int ecryptfs_lookup_and_interpose_lower(struct dentry *ecryptfs_dentry,
         struct vfsmount *lower_mnt;
         struct inode *lower_inode;
         struct ecryptfs_mount_crypt_stat *mount_crypt_stat;
+        struct ecryptfs_crypt_stat *crypt_stat;
         char *page_virt = NULL;
         u64 file_size;
         int rc = 0;
@@ -314,6 +314,11 @@ int ecryptfs_lookup_and_interpose_lower(struct dentry *ecryptfs_dentry,
                         goto out_free_kmem;
                 }
         }
+        crypt_stat = &ecryptfs_inode_to_private(
+                                        ecryptfs_dentry->d_inode)->crypt_stat;
+        /* TODO: lock for crypt_stat comparison */
+        if (!(crypt_stat->flags & ECRYPTFS_POLICY_APPLIED))
+                        ecryptfs_set_default_sizes(crypt_stat);
         rc = ecryptfs_read_and_validate_header_region(page_virt,
                                                       ecryptfs_dentry->d_inode);
         if (rc) {
@@ -362,9 +367,7 @@ static struct dentry *ecryptfs_lookup(struct inode *ecryptfs_dir_inode,
 {
         char *encrypted_and_encoded_name = NULL;
         size_t encrypted_and_encoded_name_size;
-        struct ecryptfs_crypt_stat *crypt_stat = NULL;
         struct ecryptfs_mount_crypt_stat *mount_crypt_stat = NULL;
-        struct ecryptfs_inode_info *inode_info;
         struct dentry *lower_dir_dentry, *lower_dentry;
         int rc = 0;
 
@@ -388,26 +391,15 @@ static struct dentry *ecryptfs_lookup(struct inode *ecryptfs_dir_inode,
         }
         if (lower_dentry->d_inode)
                 goto lookup_and_interpose;
-        inode_info =  ecryptfs_inode_to_private(ecryptfs_dentry->d_inode);
-        if (inode_info) {
-                crypt_stat = &inode_info->crypt_stat;
-                /* TODO: lock for crypt_stat comparison */
-                if (!(crypt_stat->flags & ECRYPTFS_POLICY_APPLIED))
-                        ecryptfs_set_default_sizes(crypt_stat);
-        }
-        if (crypt_stat)
-                mount_crypt_stat = crypt_stat->mount_crypt_stat;
-        else
-                mount_crypt_stat = &ecryptfs_superblock_to_private(
-                        ecryptfs_dentry->d_sb)->mount_crypt_stat;
-        if (!(crypt_stat && (crypt_stat->flags & ECRYPTFS_ENCRYPT_FILENAMES))
-            && !(mount_crypt_stat && (mount_crypt_stat->flags
-                                     & ECRYPTFS_GLOBAL_ENCRYPT_FILENAMES)))
+        mount_crypt_stat = &ecryptfs_superblock_to_private(
+                                ecryptfs_dentry->d_sb)->mount_crypt_stat;
+        if (!(mount_crypt_stat
+            && (mount_crypt_stat->flags & ECRYPTFS_GLOBAL_ENCRYPT_FILENAMES)))
                 goto lookup_and_interpose;
         dput(lower_dentry);
         rc = ecryptfs_encrypt_and_encode_filename(
                 &encrypted_and_encoded_name, &encrypted_and_encoded_name_size,
-                crypt_stat, mount_crypt_stat, ecryptfs_dentry->d_name.name,
+                NULL, mount_crypt_stat, ecryptfs_dentry->d_name.name,
                 ecryptfs_dentry->d_name.len);
         if (rc) {
                 printk(KERN_ERR "%s: Error attempting to encrypt and encode "
@@ -426,7 +418,7 @@ static struct dentry *ecryptfs_lookup(struct inode *ecryptfs_dir_inode,
         }
 lookup_and_interpose:
         rc = ecryptfs_lookup_and_interpose_lower(ecryptfs_dentry, lower_dentry,
-                                                 crypt_stat, ecryptfs_dir_inode,
+                                                 ecryptfs_dir_inode,
                                                  ecryptfs_nd);
         goto out;
 out_d_drop:
diff --git a/fs/ecryptfs/keystore.c b/fs/ecryptfs/keystore.c
index ff539420cc6f..e4a6223c3145 100644
--- a/fs/ecryptfs/keystore.c
+++ b/fs/ecryptfs/keystore.c
@@ -2375,7 +2375,7 @@ struct kmem_cache *ecryptfs_global_auth_tok_cache;
 
 int
 ecryptfs_add_global_auth_tok(struct ecryptfs_mount_crypt_stat *mount_crypt_stat,
-                             char *sig)
+                             char *sig, u32 global_auth_tok_flags)
 {
         struct ecryptfs_global_auth_tok *new_auth_tok;
         int rc = 0;
@@ -2389,6 +2389,7 @@ ecryptfs_add_global_auth_tok(struct ecryptfs_mount_crypt_stat *mount_crypt_stat,
                 goto out;
         }
         memcpy(new_auth_tok->sig, sig, ECRYPTFS_SIG_SIZE_HEX);
+        new_auth_tok->flags = global_auth_tok_flags;
         new_auth_tok->sig[ECRYPTFS_SIG_SIZE_HEX] = '\0';
         mutex_lock(&mount_crypt_stat->global_auth_tok_list_mutex);
         list_add(&new_auth_tok->mount_crypt_stat_list,
diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c
index 789cf2e1be1e..aed56c25539b 100644
--- a/fs/ecryptfs/main.c
+++ b/fs/ecryptfs/main.c
@@ -319,7 +319,7 @@ static int ecryptfs_parse_options(struct super_block *sb, char *options)
                 case ecryptfs_opt_ecryptfs_sig:
                         sig_src = args[0].from;
                         rc = ecryptfs_add_global_auth_tok(mount_crypt_stat,
-                                                          sig_src);
+                                                          sig_src, 0);
                         if (rc) {
                                 printk(KERN_ERR "Error attempting to register "
                                        "global sig; rc = [%d]\n", rc);
@@ -370,7 +370,8 @@ static int ecryptfs_parse_options(struct super_block *sb, char *options)
                                 ECRYPTFS_SIG_SIZE_HEX] = '\0';
                         rc = ecryptfs_add_global_auth_tok(
                                 mount_crypt_stat,
-                                mount_crypt_stat->global_default_fnek_sig);
+                                mount_crypt_stat->global_default_fnek_sig,
+                                ECRYPTFS_AUTH_TOK_FNEK);
                         if (rc) {
                                 printk(KERN_ERR "Error attempting to register "
                                        "global fnek sig [%s]; rc = [%d]\n",