Skip to content

Commit 0483913

Browse files
committed
fsverity: reject FS_IOC_ENABLE_VERITY on mode 3 fds
Commit 56124d6 ("fsverity: support enabling with tree block size < PAGE_SIZE") changed FS_IOC_ENABLE_VERITY to use __kernel_read() to read the file's data, instead of direct pagecache accesses. An unintended consequence of this is that the 'WARN_ON_ONCE(!(file->f_mode & FMODE_READ))' in __kernel_read() became reachable by fuzz tests. This happens if FS_IOC_ENABLE_VERITY is called on a fd opened with access mode 3, which means "ioctl access only". Arguably, FS_IOC_ENABLE_VERITY should work on ioctl-only fds. But ioctl-only fds are a weird Linux extension that is rarely used and that few people even know about. (The documentation for FS_IOC_ENABLE_VERITY even specifically says it requires O_RDONLY.) It's probably not worthwhile to make the ioctl internally open a new fd just to handle this case. Thus, just reject the ioctl on such fds for now. Fixes: 56124d6 ("fsverity: support enabling with tree block size < PAGE_SIZE") Reported-by: [email protected] Link: https://syzkaller.appspot.com/bug?id=2281afcbbfa8fdb92f9887479cc0e4180f1c6b28 Cc: [email protected] Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Christoph Hellwig <[email protected]> Reviewed-by: Christian Brauner <[email protected]> Signed-off-by: Eric Biggers <[email protected]>
1 parent 39049b6 commit 0483913

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

fs/verity/enable.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -357,6 +357,13 @@ int fsverity_ioctl_enable(struct file *filp, const void __user *uarg)
357357
err = file_permission(filp, MAY_WRITE);
358358
if (err)
359359
return err;
360+
/*
361+
* __kernel_read() is used while building the Merkle tree. So, we can't
362+
* allow file descriptors that were opened for ioctl access only, using
363+
* the special nonstandard access mode 3. O_RDONLY only, please!
364+
*/
365+
if (!(filp->f_mode & FMODE_READ))
366+
return -EBADF;
360367

361368
if (IS_APPEND(inode))
362369
return -EPERM;

0 commit comments

Comments
 (0)