fscrypt: don't set policy for a dead directory

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: 9bd8212 ("ext4 crypto: add encryption policy and password salt support") Cc: <[email protected]> # v4.1+ Signed-off-by: Hongjie Fang <[email protected]> Signed-off-by: Eric Biggers <[email protected]>
thirtythreeforty · May 28, 2019 · 5858bda · 5858bda
1 parent 6e4b73b
commit 5858bda
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/fs/crypto/policy.c b/fs/crypto/policy.c
@@ -81,6 +81,8 @@ int fscrypt_ioctl_set_policy(struct file *filp, const void __user *arg)
 	if (ret == -ENODATA) {
 		if (!S_ISDIR(inode->i_mode))
 			ret = -ENOTDIR;
+		else if (IS_DEADDIR(inode))
+			ret = -ENOENT;
 		else if (!inode->i_sb->s_cop->empty_dir(inode))
 			ret = -ENOTEMPTY;
 		else