Skip to content
Snippets Groups Projects
Commit 14ae9c44 authored by Eric Biggers's avatar Eric Biggers Committed by Nick Desaulniers
Browse files

UPSTREAM: fscrypto: require write access to mount to set encryption policy


commit ba63f23d69a3a10e7e527a02702023da68ef8a6d upstream.

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.

Bug: 38276297
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Cc: stable@vger.kernel.org # 4.1+; check fs/{ext4,f2fs}
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Acked-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit bf63b9d4)
Change-Id: I7431967982d93a6718497892720290e71998a542
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
parent e2f3f2b2
No related branches found
No related tags found
No related merge requests found
......@@ -644,7 +644,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
......
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment