From: Richard Weinberger <richard@nod.at>
To: tytso@mit.edu
Cc: adilger.kernel@dilger.ca, linux-kernel@vger.kernel.org,
linux-ext4@vger.kernel.org, david@sigma-star.at,
Richard Weinberger <richard@nod.at>
Subject: [PATCH] ext4: Check for encryption feature before fscrypt_process_policy()
Date: Thu, 22 Sep 2016 08:50:54 +0200 [thread overview]
Message-ID: <1474527054-24207-1-git-send-email-richard@nod.at> (raw)
...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.
Signed-off-by: Richard Weinberger <richard@nod.at>
---
fs/ext4/ioctl.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
index 1bb7df5..9e9a73e 100644
--- a/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
@@ -772,6 +772,9 @@ resizefs_out:
#ifdef CONFIG_EXT4_FS_ENCRYPTION
struct fscrypt_policy policy;
+ if (!ext4_has_feature_encrypt(sb))
+ return -EOPNOTSUPP;
+
if (copy_from_user(&policy,
(struct fscrypt_policy __user *)arg,
sizeof(policy)))
--
2.7.3
next reply other threads:[~2016-09-22 6:50 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-22 6:50 Richard Weinberger [this message]
2016-09-22 19:49 ` [PATCH] ext4: Check for encryption feature before fscrypt_process_policy() Eric Biggers
2016-09-22 20:17 ` Richard Weinberger
2016-09-22 22:38 ` Theodore Ts'o
2016-09-23 21:56 ` Eric Biggers
2016-09-30 5:53 ` Theodore Ts'o
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=1474527054-24207-1-git-send-email-richard@nod.at \
--to=richard@nod.at \
--cc=adilger.kernel@dilger.ca \
--cc=david@sigma-star.at \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-kernel@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 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).