Procházet zdrojové kódy

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>
Chao Yu před 10 roky
rodič
revize
4637fd11ff
2 změnil soubory, kde provedl 3 přidání a 6 odebrání
  1. 3 0
      fs/f2fs/crypto_policy.c
  2. 0 6
      fs/f2fs/file.c

+ 3 - 0
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;

+ 0 - 6
fs/f2fs/file.c

@@ -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;