All of lore.kernel.org
 help / color / mirror / Atom feed
From: Hongjie Fang <hongjiefang@asrmicro.com>
To: tytso@mit.edu, jaegeuk@kernel.org, ebiggers@kernel.org
Cc: linux-fscrypt@vger.kernel.org,
	Hongjie Fang <hongjiefang@asrmicro.com>,
	stable@vger.kernel.org
Subject: [PATCH V3] fscrypt: don't set policy for a dead directory
Date: Wed, 22 May 2019 10:02:53 +0800	[thread overview]
Message-ID: <1558490573-21562-1-git-send-email-hongjiefang@asrmicro.com> (raw)

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

WARNING: multiple messages have this Message-ID (diff)
From: Hongjie Fang <hongjiefang@asrmicro.com>
To: <tytso@mit.edu>, <jaegeuk@kernel.org>, <ebiggers@kernel.org>
Cc: <linux-fscrypt@vger.kernel.org>,
	Hongjie Fang <hongjiefang@asrmicro.com>, <stable@vger.kernel.org>
Subject: [PATCH V3] fscrypt: don't set policy for a dead directory
Date: Wed, 22 May 2019 10:02:53 +0800	[thread overview]
Message-ID: <1558490573-21562-1-git-send-email-hongjiefang@asrmicro.com> (raw)

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


             reply	other threads:[~2019-05-22  2:03 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-22  2:02 Hongjie Fang [this message]
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
2019-05-10  2:05 ` Hongjie Fang
2019-05-10 12:30 ` Sasha Levin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1558490573-21562-1-git-send-email-hongjiefang@asrmicro.com \
    --to=hongjiefang@asrmicro.com \
    --cc=ebiggers@kernel.org \
    --cc=jaegeuk@kernel.org \
    --cc=linux-fscrypt@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    --cc=tytso@mit.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.