summaryrefslogtreecommitdiffstats
path: root/fs/ext4/ioctl.c
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2016-09-08 23:20:38 +0200
committerTheodore Ts'o <tytso@mit.edu>2016-09-10 07:18:57 +0200
commitba63f23d69a3a10e7e527a02702023da68ef8a6d (patch)
treeef70ece0179f4d642e0b0b4d5f6aa6cfed7c9e74 /fs/ext4/ioctl.c
parentfscrypto: only allow setting encryption policy on directories (diff)
downloadlinux-ba63f23d69a3a10e7e527a02702023da68ef8a6d.tar.xz
linux-ba63f23d69a3a10e7e527a02702023da68ef8a6d.zip
fscrypto: require write access to mount to set encryption policy
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>
Diffstat (limited to 'fs/ext4/ioctl.c')
-rw-r--r--fs/ext4/ioctl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
index 10686fd67fb4..1bb7df5e4536 100644
--- a/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
@@ -776,7 +776,7 @@ resizefs_out:
(struct fscrypt_policy __user *)arg,
sizeof(policy)))
return -EFAULT;
- return fscrypt_process_policy(inode, &policy);
+ return fscrypt_process_policy(filp, &policy);
#else
return -EOPNOTSUPP;
#endif