ext4: fix no-key deletion for encrypt+casefold

commit 471fbbea7ff7 ("ext4: handle casefolding with encryption") is
missing a few checks for the encryption key which are needed to
support deleting enrypted casefolded files when the key is not
present.

This bug made it impossible to delete encrypted+casefolded directories
without the encryption key, due to errors like:

W : EXT4-fs warning (device vdc): __ext4fs_dirhash:270: inode #49202: comm Binder:378_4: Siphash requires key

Repro steps in kvm-xfstests test appliance:
mkfs.ext4 -F -E encoding=utf8 -O encrypt /dev/vdc
mount /vdc
mkdir /vdc/dir
chattr +F /vdc/dir
keyid=$(head -c 64 /dev/zero | xfs_io -c add_enckey /vdc | awk '{print $NF}')
xfs_io -c "set_encpolicy $keyid" /vdc/dir
for i in `seq 1 100`; do
mkdir /vdc/dir/$i
done
xfs_io -c "rm_enckey $keyid" /vdc
rm -rf /vdc/dir # fails with the bug

Fixes: 471fbbea7ff7 ("ext4: handle casefolding with encryption")
Signed-off-by: Daniel Rosenberg <drosen@google.com>
Link: https://lore.kernel.org/r/20210522004132.2142563-1-drosen@google.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

authored by Daniel Rosenberg and committed by Theodore Ts'o 63e7f128 afd09b61

Changed files
+4 -2
fs
ext4
+4 -2
fs/ext4/namei.c
··· 1376 1376 struct dx_hash_info *hinfo = &name->hinfo; 1377 1377 int len; 1378 1378 1379 - if (!IS_CASEFOLDED(dir) || !dir->i_sb->s_encoding) { 1379 + if (!IS_CASEFOLDED(dir) || !dir->i_sb->s_encoding || 1380 + (IS_ENCRYPTED(dir) && !fscrypt_has_encryption_key(dir))) { 1380 1381 cf_name->name = NULL; 1381 1382 return 0; 1382 1383 } ··· 1428 1427 #endif 1429 1428 1430 1429 #ifdef CONFIG_UNICODE 1431 - if (parent->i_sb->s_encoding && IS_CASEFOLDED(parent)) { 1430 + if (parent->i_sb->s_encoding && IS_CASEFOLDED(parent) && 1431 + (!IS_ENCRYPTED(parent) || fscrypt_has_encryption_key(parent))) { 1432 1432 if (fname->cf_name.name) { 1433 1433 struct qstr cf = {.name = fname->cf_name.name, 1434 1434 .len = fname->cf_name.len};