* [PATCH 2/3] f2fs crypto: check dir entry just for directory
@ 2015-05-25 10:08 Chao Yu
2015-05-27 7:27 ` [f2fs-dev] " Chao Yu
0 siblings, 1 reply; 2+ messages in thread
From: Chao Yu @ 2015-05-25 10:08 UTC (permalink / raw)
To: Jaegeuk Kim, Changman Lee; +Cc: linux-f2fs-devel, linux-kernel
This patch fixes to add a judgement condition to verify type of the
target inode before empty directory verification.
So wrong verification could be avoided for non-directory inode.
Signed-off-by: Chao Yu <chao2.yu@samsung.com>
---
fs/f2fs/crypto_policy.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/f2fs/crypto_policy.c b/fs/f2fs/crypto_policy.c
index bef254b..56b2ac0 100644
--- a/fs/f2fs/crypto_policy.c
+++ b/fs/f2fs/crypto_policy.c
@@ -93,7 +93,7 @@ int f2fs_process_policy(const struct f2fs_encryption_policy *policy,
return -EINVAL;
if (!f2fs_inode_has_encryption_context(inode)) {
- if (!f2fs_empty_dir(inode))
+ if (S_ISDIR(inode->i_mode) && !f2fs_empty_dir(inode))
return -ENOTEMPTY;
return f2fs_create_encryption_context_from_policy(inode,
policy);
--
2.3.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* RE: [f2fs-dev] [PATCH 2/3] f2fs crypto: check dir entry just for directory
2015-05-25 10:08 [PATCH 2/3] f2fs crypto: check dir entry just for directory Chao Yu
@ 2015-05-27 7:27 ` Chao Yu
0 siblings, 0 replies; 2+ messages in thread
From: Chao Yu @ 2015-05-27 7:27 UTC (permalink / raw)
To: 'Jaegeuk Kim', 'Changman Lee'
Cc: linux-kernel, linux-f2fs-devel
Hi all,
> -----Original Message-----
> From: Chao Yu [mailto:chao2.yu@samsung.com]
> Sent: Monday, May 25, 2015 6:08 PM
> To: Jaegeuk Kim; Changman Lee
> Cc: linux-kernel@vger.kernel.org; linux-f2fs-devel@lists.sourceforge.net
> Subject: [f2fs-dev] [PATCH 2/3] f2fs crypto: check dir entry just for directory
>
> This patch fixes to add a judgement condition to verify type of the
> target inode before empty directory verification.
>
> So wrong verification could be avoided for non-directory inode.
Proposal for ext4 encryption indicated that encryption policy will only
be set to an directory in below link:
https://lwn.net/Articles/639427/
So the previous patch could not fix the issue exactly, I'd like to use
the below patch instead.
>From 28540d2ab2150e586a96314336651eea74f48c7d Mon Sep 17 00:00:00 2001
From: Chao Yu <chao2.yu@samsung.com>
Date: Wed, 27 May 2015 14:51:52 +0800
Subject: [PATCH] f2fs: do not set encryption policy for non-directory by ioctl
Encryption policy should only be set to an empty directory through ioctl,
This patch add a judgement condition to verify type of the target inode
to avoid incorrectly configuring for non-directory.
Additionally, remove unneeded inline data conversion since regular or symlink
file should not be processed here.
Signed-off-by: Chao Yu <chao2.yu@samsung.com>
---
fs/f2fs/crypto_policy.c | 3 +++
fs/f2fs/file.c | 6 ------
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/fs/f2fs/crypto_policy.c b/fs/f2fs/crypto_policy.c
index 30b0b73..d4a96af 100644
--- a/fs/f2fs/crypto_policy.c
+++ b/fs/f2fs/crypto_policy.c
@@ -92,6 +92,9 @@ int f2fs_process_policy(const struct f2fs_encryption_policy *policy,
if (policy->version != 0)
return -EINVAL;
+ if (!S_ISDIR(inode->i_mode))
+ return -EINVAL;
+
if (!f2fs_inode_has_encryption_context(inode)) {
if (!f2fs_empty_dir(inode))
return -ENOTEMPTY;
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index af5ef5f..4d42d66 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -1485,12 +1485,6 @@ static int f2fs_ioc_set_encryption_policy(struct file *filp, unsigned long arg)
sizeof(policy)))
return -EFAULT;
- if (f2fs_has_inline_data(inode)) {
- int ret = f2fs_convert_inline_inode(inode);
- if (ret)
- return ret;
- }
-
return f2fs_process_policy(&policy, inode);
#else
return -EOPNOTSUPP;
--
2.3.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-05-27 7:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-05-25 10:08 [PATCH 2/3] f2fs crypto: check dir entry just for directory Chao Yu
2015-05-27 7:27 ` [f2fs-dev] " Chao Yu
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).