]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ext4: correct encrypted dentry name hash when not casefolded
authoryao.ly <yao.ly@linux.alibaba.com>
Mon, 1 Jul 2024 06:43:39 +0000 (14:43 +0800)
committerTheodore Ts'o <tytso@mit.edu>
Tue, 27 Aug 2024 01:20:25 +0000 (21:20 -0400)
EXT4_DIRENT_HASH and EXT4_DIRENT_MINOR_HASH will access struct
ext4_dir_entry_hash followed ext4_dir_entry. But there is no ext4_dir_entry_hash
followed when inode is encrypted and not casefolded

Signed-off-by: yao.ly <yao.ly@linux.alibaba.com>
Link: https://patch.msgid.link/1719816219-128287-1-git-send-email-yao.ly@linux.alibaba.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Cc: stable@kernel.org
fs/ext4/dir.c

index ff4514e4626bdbcfaf96bf48d91f6fb3cb32b512..b8b6b06015cd3bf4ebbeb46ddadf9fde968728c5 100644 (file)
@@ -279,12 +279,20 @@ static int ext4_readdir(struct file *file, struct dir_context *ctx)
                                        struct fscrypt_str de_name =
                                                        FSTR_INIT(de->name,
                                                                de->name_len);
+                                       u32 hash;
+                                       u32 minor_hash;
+
+                                       if (IS_CASEFOLDED(inode)) {
+                                               hash = EXT4_DIRENT_HASH(de);
+                                               minor_hash = EXT4_DIRENT_MINOR_HASH(de);
+                                       } else {
+                                               hash = 0;
+                                               minor_hash = 0;
+                                       }
 
                                        /* Directory is encrypted */
                                        err = fscrypt_fname_disk_to_usr(inode,
-                                               EXT4_DIRENT_HASH(de),
-                                               EXT4_DIRENT_MINOR_HASH(de),
-                                               &de_name, &fstr);
+                                               hash, minor_hash, &de_name, &fstr);
                                        de_name = fstr;
                                        fstr.len = save_len;
                                        if (err)