diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2015-06-12 23:44:33 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2015-06-12 23:44:33 -0400 |
| commit | 1cb767cd4a79703105f4f3774c76896d621fdc54 (patch) | |
| tree | a15852e8d6961417865bce77da77844b86039999 /fs | |
| parent | 331573febb6a224bc50322e3670da326cb7f4cfc (diff) | |
| download | linux-stable-1cb767cd4a79703105f4f3774c76896d621fdc54.tar.gz linux-stable-1cb767cd4a79703105f4f3774c76896d621fdc54.tar.bz2 linux-stable-1cb767cd4a79703105f4f3774c76896d621fdc54.zip | |
ext4 crypto: fail the mount if blocksize != pagesize
We currently don't correctly handle the case where blocksize !=
pagesize, so disallow the mount in those cases.
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ext4/super.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 31e85bea9652..e13fe40d4a51 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -4065,7 +4065,15 @@ no_journal: } } - if (unlikely(sbi->s_mount_flags & EXT4_MF_TEST_DUMMY_ENCRYPTION) && + if ((DUMMY_ENCRYPTION_ENABLED(sbi) || + EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_ENCRYPT)) && + (blocksize != PAGE_CACHE_SIZE)) { + ext4_msg(sb, KERN_ERR, + "Unsupported blocksize for fs encryption"); + goto failed_mount_wq; + } + + if (DUMMY_ENCRYPTION_ENABLED(sbi) && !(sb->s_flags & MS_RDONLY) && !EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_ENCRYPT)) { EXT4_SET_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_ENCRYPT); |