Skip to contentSkip to conversation

fscrypt: don't set policy for a dead directory

PATCH New Eric Biggers 1 participant 1 message Jul 11, 2019

Subsystems (2)
lore
Share & tools
lore

Eric Biggers

author maintainer
#0 lore raw

PATCH 1/1 fscrypt: don't set policy for a dead directory

From: Hongjie Fang <[email protected]>

commit 5858bdad4d0d0fc18bf29f34c3ac836e0b59441f upstream. [Please apply to 4.4-stable.]

The directory may have been removed when entering fscrypt_ioctl_set_policy(). If so, the empty_dir() check will return error for ext4 file system.

ext4_rmdir() sets i_size = 0, then ext4_empty_dir() reports an error because 'inode->i_size < EXT4_DIR_REC_LEN(1) + EXT4_DIR_REC_LEN(2)'. If the fs is mounted with errors=panic, it will trigger a panic issue.

Add the check IS_DEADDIR() to fix this problem.

Fixes 9bd8212f981e ("ext4 crypto: add encryption policy and password salt support")
Cc <[email protected]> # v4.1+
---
 fs/ext4/crypto_policy.c | 2 ++
 fs/f2fs/crypto_policy.c | 2 ++
 2 files changed, 4 insertions(+)
fs/ext4/crypto_policy.c +2 -0
index e4f4fc4e56abee..77bd7bfb632913 100644
@@ -111,6 +111,8 @@ int ext4_process_policy(const struct ext4_encryption_policy *policy,
 	if (!ext4_inode_has_encryption_context(inode)) {
 		if (!S_ISDIR(inode->i_mode))
 			return -EINVAL;
+		if (IS_DEADDIR(inode))
+			return -ENOENT;
 		if (!ext4_empty_dir(inode))
 			return -ENOTEMPTY;
 		return ext4_create_encryption_context_from_policy(inode,
fs/f2fs/crypto_policy.c +2 -0
index 884f3f0fe29d32..613ca32ec24887 100644
@@ -99,6 +99,8 @@ int f2fs_process_policy(const struct f2fs_encryption_policy *policy,
 		return -EINVAL;
 
 	if (!f2fs_inode_has_encryption_context(inode)) {
+		if (IS_DEADDIR(inode))
+			return -ENOENT;
 		if (!f2fs_empty_dir(inode))
 			return -ENOTEMPTY;
 		return f2fs_create_encryption_context_from_policy(inode,
Signature · 1 line
2.22.0.410.gd8fdbe21b5-goog