Message ID | 20190711164148.230281-1-ebiggers@kernel.org (mailing list archive) |
---|---|
State | Accepted |
Headers | show |
Series | [4.9] fscrypt: don't set policy for a dead directory | expand |
On Thu, Jul 11, 2019 at 09:41:48AM -0700, Eric Biggers wrote: > From: Hongjie Fang <hongjiefang@asrmicro.com> > > commit 5858bdad4d0d0fc18bf29f34c3ac836e0b59441f upstream. > [Please apply to 4.9-stable.] 4.9 and 4.4 patches now queued up, thanks! greg k-h
diff --git a/fs/crypto/policy.c b/fs/crypto/policy.c index c160d2d0e18d77..57a97b38a2fa2c 100644 --- a/fs/crypto/policy.c +++ b/fs/crypto/policy.c @@ -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))