fscrypt: don't set policy for a dead directory
Subsystems (2)
Eric Biggers
maintainerPATCH 1/1 fscrypt: don't set policy for a dead directory
From: Hongjie Fang <[email protected]>
commit 5858bdad4d0d0fc18bf29f34c3ac836e0b59441f upstream. [Please apply to 4.9-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.
--- fs/crypto/policy.c | 2 ++ 1 file changed, 2 insertions(+)
fs/crypto/policy.c +2 -0
@@ -114,6 +114,8 @@ int fscrypt_process_policy(struct file *filp,if (!inode_has_encryption_context (inode)) {if (!S_ISDIR (inode->i_mode)) ret = -ENOTDIR ; +else if (IS_DEADDIR (inode)) + ret = -ENOENT ;else if (!inode->i_sb->s_cop->empty_dir) ret = -EOPNOTSUPP ;else if (!inode->i_sb->s_cop->empty_dir (inode))
Signature · 1 line
2.22.0.410.gd8fdbe21b5-goog
Greg KH
maintainerQuoted 4 lines · Eric Biggers
From: Hongjie Fang <[email protected]>
commit
5858bdad4d0d0fc18bf29f34c3ac836e0b59441fupstream. [Please apply to 4.9-stable.]
4.9 and 4.4 patches now queued up, thanks!
greg k-h