1 files changed, 10 insertions, 1 deletions

diff --git a/fs/f2fs/hash.c b/fs/f2fs/hash.c
index de841aaf3c43..e3beac546c63 100644
--- a/fs/f2fs/hash.c
+++ b/fs/f2fs/hash.c
@@ -111,7 +111,9 @@ void f2fs_hash_filename(const struct inode *dir, struct f2fs_filename *fname)
                  * If the casefolded name is provided, hash it instead of the
                  * on-disk name.  If the casefolded name is *not* provided, that
                  * should only be because the name wasn't valid Unicode, so fall
-                 * back to treating the name as an opaque byte sequence.
+                 * back to treating the name as an opaque byte sequence.  Note
+                 * that to handle encrypted directories, the fallback must use
+                 * usr_fname (plaintext) rather than disk_name (ciphertext).
                  */
                 WARN_ON_ONCE(!fname->usr_fname->name);
                 if (fname->cf_name.name) {
@@ -121,6 +123,13 @@ void f2fs_hash_filename(const struct inode *dir, struct f2fs_filename *fname)
                         name = fname->usr_fname->name;
                         len = fname->usr_fname->len;
                 }
+                if (IS_ENCRYPTED(dir)) {
+                        struct qstr tmp = QSTR_INIT(name, len);
+
+                        fname->hash =
+                                cpu_to_le32(fscrypt_fname_siphash(dir, &tmp));
+                        return;
+                }
         }
 #endif
         fname->hash = cpu_to_le32(TEA_hash_name(name, len));