Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4637fd11 authored May 27, 2015 by Chao Yu Committed by Jaegeuk Kim Jun 01, 2015

f2fs crypto: 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>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

parent 81b0a8ff

fs/f2fs/crypto_policy.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -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;

fs/f2fs/file.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -1395,12 +1395,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;