* [PATCH V3] fscrypt: don't set policy for a dead directory
@ 2019-05-22 2:02 Hongjie Fang
2019-05-29 20:50 ` Eric Biggers
0 siblings, 1 reply; 3+ messages in thread
From: Hongjie Fang @ 2019-05-22 2:02 UTC (permalink / raw)
To: tytso, jaegeuk, ebiggers; +Cc: linux-fscrypt, Hongjie Fang, stable
the directory maybe has been removed when enter 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: <stable@vger.kernel.org> # v4.1+
Signed-off-by: Hongjie Fang <hongjiefang@asrmicro.com>
---
fs/crypto/policy.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/fs/crypto/policy.c b/fs/crypto/policy.c
index d536889..4941fe8 100644
--- 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
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH V3] fscrypt: don't set policy for a dead directory
2019-05-22 2:02 [PATCH V3] fscrypt: don't set policy for a dead directory Hongjie Fang
@ 2019-05-29 20:50 ` Eric Biggers
0 siblings, 0 replies; 3+ messages in thread
From: Eric Biggers @ 2019-05-29 20:50 UTC (permalink / raw)
To: Hongjie Fang; +Cc: tytso, jaegeuk, linux-fscrypt, stable
On Wed, May 22, 2019 at 10:02:53AM +0800, Hongjie Fang wrote:
> the directory maybe has been removed when enter 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: <stable@vger.kernel.org> # v4.1+
> Signed-off-by: Hongjie Fang <hongjiefang@asrmicro.com>
> ---
> fs/crypto/policy.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/fs/crypto/policy.c b/fs/crypto/policy.c
> index d536889..4941fe8 100644
> --- 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
> --
> 1.9.1
>
Applied to fscrypt.git for v5.3.
- Eric
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH V3] fscrypt: don't set policy for a dead directory
@ 2019-05-10 2:05 Hongjie Fang
0 siblings, 0 replies; 3+ messages in thread
From: Hongjie Fang @ 2019-05-10 2:05 UTC (permalink / raw)
To: tytso, jaegeuk, ebiggers; +Cc: linux-fscrypt, Hongjie Fang, stable
the directory maybe has been removed when enter fscrypt_ioctl_set_policy().
it this case, 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: <stable@vger.kernel.org> # v4.1+
Signed-off-by: Hongjie Fang <hongjiefang@asrmicro.com>
---
fs/crypto/policy.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/fs/crypto/policy.c b/fs/crypto/policy.c
index bd7eaf9..a4eca6e 100644
--- 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
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-05-29 20:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-22 2:02 [PATCH V3] fscrypt: don't set policy for a dead directory Hongjie Fang
2019-05-29 20:50 ` Eric Biggers
-- strict thread matches above, loose matches on Subject: below --
2019-05-10 2:05 Hongjie Fang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).