fscrypto: require write access to mount to set encryption policy

[ Upstream commit ba63f23d69a3a10e7e527a02702023da68ef8a6d ]

Since setting an encryption policy requires writing metadata to the
filesystem, it should be guarded by mnt_want_write/mnt_drop_write.
Otherwise, a user could cause a write to a frozen or readonly
filesystem.  This was handled correctly by f2fs but not by ext4.  Make
fscrypt_process_policy() handle it rather than relying on the filesystem
to get it right.

Signed-off-by: Eric Biggers <ebiggers@google.com>
Cc: stable@vger.kernel.org # 4.1+; check fs/{ext4,f2fs}
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Acked-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>

diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
index 2cb9e178d1c557f62c35d1d0f7bd0d911665738a..4196aa5677842e4d58dd4115c4ce9f61c4840aa8 100644 (file)
--- a/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
@@ -637,7 +637,13 @@ resizefs_out:
                        goto encryption_policy_out;
                }
 
+               err = mnt_want_write_file(filp);
+               if (err)
+                       goto encryption_policy_out;
+
                err = ext4_process_policy(&policy, inode);
+
+               mnt_drop_write_file(filp);
 encryption_policy_out:
                return err;
 #else