summaryrefslogtreecommitdiff
path: root/fs/ext4/verity.c
diff options
context:
space:
mode:
authorIra Weiny <ira.weiny@intel.com>2020-05-28 17:59:56 +0300
committerTheodore Ts'o <tytso@mit.edu>2020-05-29 05:09:47 +0300
commit6c0d077ff8200a7b8e7131ca8e25315dec243a60 (patch)
treea49d7225d9485cde40cf91364e7709b74e541b5b /fs/ext4/verity.c
parentff694ab60c29cfeba81b3d5068d3c908f22110ed (diff)
downloadlinux-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>
Diffstat (limited to 'fs/ext4/verity.c')
-rw-r--r--fs/ext4/verity.c3
1 files changed, 3 insertions, 0 deletions
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;