Skip to contentSkip to conversation

Patch "ext4: require encryption feature for EXT4_IOC_SET_ENCRYPTION_POLICY" has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message May 5, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

ext4: require encryption feature for EXT4_IOC_SET_ENCRYPTION_POLICY

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
ext4-require-encryption-feature-for-ext4_ioc_set_encryption_policy.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 9a200d075e5d05be1fcad4547a0f8aee4e2f9a04 Mon Sep 17 00:00:00 2001

From: Richard Weinberger <[email protected]>
Date: Fri, 30 Sep 2016 01:49:55 -0400
Subject: ext4: require encryption feature for EXT4_IOC_SET_ENCRYPTION_POLICY

From: Richard Weinberger <[email protected]>

commit 9a200d075e5d05be1fcad4547a0f8aee4e2f9a04 upstream.

...otherwise an user can enable encryption for certain files even when the filesystem is unable to support it.
Such a case would be a filesystem created by mkfs.ext4's default settings, 1KiB block size. Ext4 supports encyption only when block size is equal to PAGE_SIZE.
But this constraint is only checked when the encryption feature flag is set.

---
 fs/ext4/ioctl.c |    3 +++
 1 file changed, 3 insertions(+)
fs/ext4/ioctl.c +3 -0
@@ -622,6 +622,9 @@ resizefs_out:
 		struct ext4_encryption_policy policy;
 		int err = 0;
 
+		if (!ext4_has_feature_encrypt(sb))
+			return -EOPNOTSUPP;
+
 		if (copy_from_user(&policy,
 				   (struct ext4_encryption_policy __user *)arg,
 				   sizeof(policy))) {

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/ext4-require-encryption-feature-for-ext4_ioc_set_encryption_policy.patch