diff options
author | Ira Weiny <ira.weiny@intel.com> | 2020-05-28 17:59:56 +0300 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2020-05-29 05:09:47 +0300 |
commit | 6c0d077ff8200a7b8e7131ca8e25315dec243a60 (patch) | |
tree | a49d7225d9485cde40cf91364e7709b74e541b5b | |
parent | ff694ab60c29cfeba81b3d5068d3c908f22110ed (diff) | |
download | linux-6c0d077ff8200a7b8e7131ca8e25315dec243a60.tar.xz |
fs/ext4: Disallow verity if inode is DAX
Verity and DAX are incompatible. Changing the DAX mode due to a verity
flag change is wrong without a corresponding address_space_operations
update.
Make the 2 options mutually exclusive by returning an error if DAX was
set first.
(Setting DAX is already disabled if Verity is set first.)
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
Link: https://lore.kernel.org/r/20200528150003.828793-3-ira.weiny@intel.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
-rw-r--r-- | Documentation/filesystems/ext4/verity.rst | 3 | ||||
-rw-r--r-- | fs/ext4/verity.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/filesystems/ext4/verity.rst b/Documentation/filesystems/ext4/verity.rst index 3e4c0ee0e068..e99ff3fd09f7 100644 --- a/Documentation/filesystems/ext4/verity.rst +++ b/Documentation/filesystems/ext4/verity.rst @@ -39,3 +39,6 @@ is encrypted as well as the data itself. Verity files cannot have blocks allocated past the end of the verity metadata. + +Verity and DAX are not compatible and attempts to set both of these flags +on a file will fail. diff --git a/fs/ext4/verity.c b/fs/ext4/verity.c index dc5ec724d889..f05a09fb2ae4 100644 --- a/fs/ext4/verity.c +++ b/fs/ext4/verity.c @@ -113,6 +113,9 @@ static int ext4_begin_enable_verity(struct file *filp) handle_t *handle; int err; + if (IS_DAX(inode)) + return -EINVAL; + if (ext4_verity_in_progress(inode)) return -EBUSY; |