eCryptfs: Filename Encryption: filldir, lookup, and readlink

Make the requisite modifications to ecryptfs_filldir(), ecryptfs_lookup(),
and ecryptfs_readlink() to call out to filename encryption functions.
Propagate filename encryption policy flags from mount-wide crypt_stat to
inode crypt_stat.

Signed-off-by: Michael Halcrow <mhalcrow@us.ibm.com>
Cc: Dustin Kirkland <dustin.kirkland@gmail.com>
Cc: Eric Sandeen <sandeen@redhat.com>
Cc: Tyler Hicks <tchicks@us.ibm.com>
Cc: David Kleikamp <shaggy@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 15 insertions, 15 deletions

diff --git a/fs/ecryptfs/file.c b/fs/ecryptfs/file.c
index 713834371229..567eb4bee1b6 100644
--- a/fs/ecryptfs/file.c
+++ b/fs/ecryptfs/file.c
@@ -77,27 +77,27 @@ struct ecryptfs_getdents_callback {
 
 /* Inspired by generic filldir in fs/readdir.c */
 static int
-ecryptfs_filldir(void *dirent, const char *name, int namelen, loff_t offset,
-                 u64 ino, unsigned int d_type)
+ecryptfs_filldir(void *dirent, const char *lower_name, int lower_namelen,
+                 loff_t offset, u64 ino, unsigned int d_type)
 {
-        struct ecryptfs_crypt_stat *crypt_stat;
         struct ecryptfs_getdents_callback *buf =
             (struct ecryptfs_getdents_callback *)dirent;
+        int name_size;
+        char *name;
         int rc;
-        int decoded_length;
-        char *decoded_name;
 
-        crypt_stat = ecryptfs_dentry_to_private(buf->dentry)->crypt_stat;
         buf->filldir_called++;
-        decoded_length = ecryptfs_decode_filename(crypt_stat, name, namelen,
-                                                  &decoded_name);
-        if (decoded_length < 0) {
-                rc = decoded_length;
+        rc = ecryptfs_decode_and_decrypt_filename(&name, &name_size,
+                                                  buf->dentry, lower_name,
+                                                  lower_namelen);
+        if (rc) {
+                printk(KERN_ERR "%s: Error attempting to decode and decrypt "
+                       "filename [%s]; rc = [%d]\n", __func__, lower_name,
+                       rc);
                 goto out;
         }
-        rc = buf->filldir(buf->dirent, decoded_name, decoded_length, offset,
-                          ino, d_type);
-        kfree(decoded_name);
+        rc = buf->filldir(buf->dirent, name, name_size, offset, ino, d_type);
+        kfree(name);
         if (rc >= 0)
                 buf->entries_written++;
 out:
@@ -106,8 +106,8 @@ out:
 
 /**
  * ecryptfs_readdir
- * @file: The ecryptfs file struct
- * @dirent: Directory entry
+ * @file: The eCryptfs directory file
+ * @dirent: Directory entry handle
  * @filldir: The filldir callback function
  */
 static int ecryptfs_readdir(struct file *file, void *dirent, filldir_t filldir)