From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-io0-f196.google.com ([209.85.223.196]:45121 "EHLO mail-io0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751630AbdJXXco (ORCPT ); Tue, 24 Oct 2017 19:32:44 -0400 Received: by mail-io0-f196.google.com with SMTP id i38so25697981iod.2 for ; Tue, 24 Oct 2017 16:32:43 -0700 (PDT) From: Eric Biggers To: stable@vger.kernel.org Cc: Jaegeuk Kim , Eric Biggers , Theodore Ts'o Subject: [PATCH] fscrypto: require write access to mount to set encryption policy Date: Tue, 24 Oct 2017 16:32:16 -0700 Message-Id: <20171024233216.70844-1-ebiggers3@gmail.com> Sender: stable-owner@vger.kernel.org List-ID: From: Eric Biggers 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 Cc: stable@vger.kernel.org # 4.1+; check fs/{ext4,f2fs} Signed-off-by: Theodore Ts'o Acked-by: Jaegeuk Kim --- fs/f2fs/file.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index 4b449d263333..01eed94b01ea 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -1541,12 +1541,18 @@ static int f2fs_ioc_set_encryption_policy(struct file *filp, unsigned long arg) sizeof(policy))) return -EFAULT; + err = mnt_want_write_file(filp); + if (err) + return err; + mutex_lock(&inode->i_mutex); err = f2fs_process_policy(&policy, inode); mutex_unlock(&inode->i_mutex); + mnt_drop_write_file(filp); + return err; #else return -EOPNOTSUPP; -- 2.15.0.rc0.271.g36b669edcc-goog