Skip to content

Commit 1bb1d42

Browse files
ebiggersgregkh
authored andcommitted
fscrypto: require write access to mount to set encryption policy
commit ba63f23d69a3a10e7e527a02702023da68ef8a6d upstream. [Please apply to 4.4-stable. Note: this was already backported, but only to ext4; it was missed that it should go to f2fs as well. This is needed to make xfstest generic/395 pass on f2fs.] 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> Signed-off-by: Theodore Ts'o <tytso@mit.edu> Acked-by: Jaegeuk Kim <jaegeuk@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 8a004ca commit 1bb1d42

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

fs/f2fs/file.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1541,12 +1541,18 @@ static int f2fs_ioc_set_encryption_policy(struct file *filp, unsigned long arg)
15411541
sizeof(policy)))
15421542
return -EFAULT;
15431543

1544+
err = mnt_want_write_file(filp);
1545+
if (err)
1546+
return err;
1547+
15441548
mutex_lock(&inode->i_mutex);
15451549

15461550
err = f2fs_process_policy(&policy, inode);
15471551

15481552
mutex_unlock(&inode->i_mutex);
15491553

1554+
mnt_drop_write_file(filp);
1555+
15501556
return err;
15511557
#else
15521558
return -EOPNOTSUPP;

0 commit comments

Comments
 (0)